Bladeren bron

bug 修复

lilei 1 jaar geleden
bovenliggende
commit
54d70c859a

+ 0 - 14
src/components/global.less

@@ -587,14 +587,6 @@ body {
   .ant-input-group-addon{
     border: 0;
   }
-  .form-model-con.ant-form.ant-form-inline{  // a-form-model  有必选条件(因校验提示信息原因,因此边距需高于无必选条件边距)
-    .ant-form-item {
-      margin-bottom: 16px!important;
-      .ant-form-explain{
-        font-size: 12px;
-      }
-    }
-  }
   .table-page-search-submitButtons {
     margin-bottom: 9px;
   }
@@ -624,11 +616,5 @@ body {
       }
     }
   }
-
-  .table-page-search-submitButtons {
-    display: block;
-    margin-bottom: 24px;
-    white-space: nowrap;
-  }
 }
  

+ 25 - 20
src/views/salesManagement/pushOrderManagement/list.vue

@@ -1,7 +1,7 @@
 <template>
-  <a-card size="small" :bordered="false" class="pushOrder-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
+  <div>
+     <!-- 搜索条件 -->
+    <a-card size="small" :bordered="false" class="pushOrder-wrap">
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="15">
@@ -20,12 +20,12 @@
                 <a-input id="pushOrder-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="备货单号">
+                <a-input id="pushOrder-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+              </a-form-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="备货单号">
-                  <a-input id="pushOrder-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="收货客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
                   <dealerSubareaScopeList ref="shbuyerName" id="pushOrder-shbuyerName" @change="shcustChange" />
@@ -104,19 +104,20 @@
           </a-row>
         </a-form>
       </div>
-      <!-- alert -->
-      <a-alert type="info" style="margin-bottom:10px">
-        <div slot="message">
-          下推总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
-          下推总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
-          <span v-if="$hasPermissions('M_pushOrderManagementList_salesPrice')">下推总金额:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;</span>
-        </div>
-      </a-alert>
+    </a-card>
+ 
+  <a-card size="small" :bordered="false" class="pushOrder-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <div class="tongji-bar" style="margin-bottom:10px">
+       下推总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
+         下推总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
+         <span v-if="$hasPermissions('M_pushOrderManagementList_salesPrice')">下推总金额:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;</span>
+      </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+70+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
@@ -186,6 +187,7 @@
       <explainInfoModal v-drag :rowData="tipData" :openModal="showInfoModal" @close="canselModal"></explainInfoModal>
     </a-spin>
   </a-card>
+   </div>
 </template>
 
 <script>
@@ -388,7 +390,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 240
+      this.tableHeight = window.innerHeight - tableSearchH - 230
     }
   },
   watch: {
@@ -427,8 +429,11 @@ export default {
 </script>
 <style lang="less">
   .pushOrder-wrap{
-    .sTable{
-      margin-top: 10px;
+    margin-bottom: 6px;
+    &:first-child{
+      .ant-card-body{
+        padding-bottom: 2px;
+      }
     }
   }
 </style>

+ 40 - 22
src/views/salesManagement/salesOrderWarehouse/detail.vue

@@ -3,7 +3,13 @@
     <a-spin :spinning="spinning" tip="Loading...">
       <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont" style="padding:16px 24px;">
         <template slot="subTitle">
-           <a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
+          <a id="salesEdit-back-btn" href="javascript:;" @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>
+          <a-button type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
         <template slot="extra">
           <a-button
@@ -14,26 +20,25 @@
             @click="handlePrint">导出Excel</a-button>
         </template>
       </a-page-header>
+       
       <!-- 基础信息 -->
-      <a-card size="small" :bordered="false" class="salesDetail-cont">
-        <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" header="基础信息" v-if="detailData">
-            <a-descriptions size="small" :column="3">
-              <a-descriptions-item label="销售单号">{{ detailData.salesBillNo || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="创建时间">{{ detailData.createDate || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="客户名称">{{ detailData.buyerName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="收货地址" :span="2" v-if="detailData&&detailData.salesBillExtEntity">
-                {{ detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrProvinceName || '' }}
-                {{ detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrCityName || '' }}
-                {{ detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrCountyName || '' }}
-                {{ detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddr || '' }}
-              </a-descriptions-item>
-              <a-descriptions-item label="收货人" v-if="detailData.salesBillExtEntity">{{ detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="收货电话" v-if="detailData.salesBillExtEntity">{{ detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeTel || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="业务状态">{{ detailData.billStatusDictValue || '--' }}</a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+      <a-card size="small" :bordered="false" class="salesDetail-cont" v-show="showDetail">
+        <div v-if="detailData">
+         <a-descriptions size="small" :column="3">
+           <a-descriptions-item label="销售单号">{{ detailData.salesBillNo || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="创建时间">{{ detailData.createDate || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="客户名称">{{ detailData.buyerName || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="收货地址" :span="2" v-if="detailData&&detailData.salesBillExtEntity">
+             {{ detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrProvinceName || '' }}
+             {{ detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrCityName || '' }}
+             {{ detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrCountyName || '' }}
+             {{ detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddr || '' }}
+           </a-descriptions-item>
+           <a-descriptions-item label="收货人" v-if="detailData.salesBillExtEntity">{{ detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeName || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="收货电话" v-if="detailData.salesBillExtEntity">{{ detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeTel || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="业务状态">{{ detailData.billStatusDictValue || '--' }}</a-descriptions-item>
+         </a-descriptions>
+        </div>
       </a-card>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <!-- alert -->
@@ -47,14 +52,16 @@
         </a-alert>
         <!-- 列表 -->
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
+          :style="{ height: tableHeight+65+'px' }"
           ref="table"
           size="small"
           :rowKey="(record) => record.no"
           rowKeyName="no"
           :columns="columns"
+          :pageSize="30"
           :data="loadData"
-          :scroll="{ y: 500 }"
+          :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>
           <!-- 产品编码 -->
@@ -106,6 +113,8 @@ export default {
       countData: null, // 数量数据
       fromRouter: null,
       openModal:false,
+      showDetail: false,
+      tableHeight: 300
     }
   },
   computed: {
@@ -122,9 +131,17 @@ export default {
         arr.splice(4, 0, { title: '出库仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
       }
       return arr
+    },
+  },
+  watch: {
+    showDetail(newValue, oldValue) {
+      this.getTableHeight()
     }
   },
   methods: {
+    getTableHeight(){
+      this.tableHeight =  window.innerHeight - (this.showDetail ? 390 : 275)
+    },
     handlePrint(){
       this.openModal = true
     },
@@ -165,6 +182,7 @@ export default {
         } else {
           this.countData = null
         }
+        this.getTableHeight()
       })
     }
   },

+ 84 - 82
src/views/salesManagement/salesOrderWarehouse/list.vue

@@ -1,85 +1,87 @@
 <template>
+  <div>
+  <!-- 搜索条件 -->
+  <a-card size="small" :bordered="false" class="salesOrderWarehouseList-wrap">
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form-model
+        id="salesOrderWarehouseList-form"
+        ref="ruleForm"
+        class="form-model-con"
+        layout="inline"
+        :rules="rules"
+        :model="queryParam"
+        @keyup.enter.native="handleSearch">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="创建时间" prop="time">
+              <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="客户名称">
+              <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesManagementList-buyerName" @change="custChange" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="销售单号">
+              <a-input id="salesOrderWarehouseList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="业务状态">
+              <v-select
+                v-model="queryParam.billStatus"
+                ref="billStatus"
+                id="salesManagementList-billStatus"
+                code="SALES_BILL_STATUS"
+                placeholder="请选择业务状态"
+                allowClear></v-select>
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
+              <Area id="salesOrderWarehouseList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="6" :sm="24" v-show="isShowWarehouse">
+            <a-form-model-item label="出库仓库">
+              <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesOrderWarehouseList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesOrderWarehouseList-reset">重置</a-button>
+            <a-button
+              style="margin-left: 10px"
+              type="primary"
+              class="button-warning"
+              @click="handleExport"
+              :disabled="disabled"
+              :loading="exportLoading"
+              v-if="$hasPermissions('B_salesOrderWarehouseExport')"
+            >导出</a-button>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </div>
+  </a-card>
+ 
   <a-card size="small" :bordered="false" class="salesOrderWarehouseList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form-model
-          id="salesOrderWarehouseList-form"
-          ref="ruleForm"
-          class="form-model-con"
-          layout="inline"
-          :rules="rules"
-          :model="queryParam"
-          @keyup.enter.native="handleSearch">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="创建时间" prop="time">
-                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户名称">
-                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesManagementList-buyerName" @change="custChange" />
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="销售单号">
-                <a-input id="salesOrderWarehouseList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="业务状态">
-                <v-select
-                  v-model="queryParam.billStatus"
-                  ref="billStatus"
-                  id="salesManagementList-billStatus"
-                  code="SALES_BILL_STATUS"
-                  placeholder="请选择业务状态"
-                  allowClear></v-select>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
-                <Area id="salesOrderWarehouseList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24" v-show="isShowWarehouse">
-              <a-form-model-item label="出库仓库">
-                <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-              <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesOrderWarehouseList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesOrderWarehouseList-reset">重置</a-button>
-              <a-button
-                style="margin-left: 10px"
-                type="primary"
-                class="button-warning"
-                @click="handleExport"
-                :disabled="disabled"
-                :loading="exportLoading"
-                v-if="$hasPermissions('B_salesOrderWarehouseExport')"
-              >导出</a-button>
-            </a-col>
-          </a-row>
-        </a-form-model>
+      <div class="tongji-bar" style="margin-bottom:10px">
+        <!-- 总款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '0' }}</strong>; -->
+        总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
       </div>
-      <!-- alert -->
-      <a-alert type="info" style="margin-bottom:10px">
-        <div slot="message">
-          <!-- 总款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '0' }}</strong>; -->
-          总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
-        </div>
-      </a-alert>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+65+'px' }"
         size="small"
         :rowKey="(record) => record.no"
         rowKeyName="no"
         :columns="columns"
+        :pageSize="30"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
@@ -94,6 +96,7 @@
     <!-- 导出提示框 -->
     <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
+   </div>
 </template>
 
 <script>
@@ -162,11 +165,11 @@ export default {
   computed: {
     columns () {
       const arr = [
-        { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', scopedSlots: { customRender: 'stockOutNo' }, width: '10%', align: 'center' },
-        { title: '提交时间', dataIndex: 'submitDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售单号', scopedSlots: { customRender: 'stockOutNo' }, width: '15%', align: 'center' },
+        { title: '提交时间', dataIndex: 'submitDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '32%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '总数量', dataIndex: 'totalQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
@@ -254,7 +257,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 225
     }
   },
   watch: {
@@ -287,12 +290,11 @@ export default {
 </script>
 <style lang="less">
   .salesOrderWarehouseList-wrap{
-    .active{
-      color: #ed1c24;
-      cursor: pointer;
-    }
-    .common{
-      color: rgba(0, 0, 0);
+    margin-bottom: 6px;
+    &:first-child{
+      .ant-card-body{
+        padding-bottom: 2px;
+      }
     }
   }
 </style>

+ 3 - 0
src/views/salesManagement/salesOrderWarehouse/printModal.vue

@@ -137,6 +137,9 @@ export default {
 
 <style lang="less">
   .sales-print-type-modal{
+    .ant-form-item{
+      margin-bottom: 10px;
+    }
     .btn-cont {
       text-align: center;
       margin: 35px 0 10px;

+ 1 - 0
src/views/salesManagement/salesQueryNew/detail.vue

@@ -6,6 +6,7 @@
           <a id="salesEdit-back-btn" href="javascript:;" @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>
           <a-button type="link" class="button-default" @click="showDetail=!showDetail">
             <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
           </a-button>

+ 1 - 0
src/views/salesManagement/salesQueryNew/edit.vue

@@ -7,6 +7,7 @@
           <a id="salesEdit-back-btn" href="javascript:;" @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>
           <a-button type="link" class="button-default" @click="showDetail=!showDetail">
             <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
           </a-button>

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

@@ -2,7 +2,7 @@
   <div>
     <a-card size="small" :bordered="false" class="salesManagementList-wrap">
       <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper" style="margin: 0;">
+      <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
@@ -419,7 +419,7 @@ export default {
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '7%', align: 'center' },
         { title: <a-tooltip placement='top' title='第一次提交时间'>提交时间&nbsp;<a-icon type="question-circle" /></a-tooltip>, dataIndex: 'firstSubmitDate', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') }, sorter: true },
         { title: '客户名称', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '出库仓库', scopedSlots: { customRender: 'warehouseBox' }, width: '8%', align: 'center', ellipsis: true },
+        { title: '出库仓库', scopedSlots: { customRender: 'warehouseBox' }, width: '8%', align: 'left', ellipsis: true },
         { title: '总数量', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: '4%', align: 'center' },
         { title: '已下推数量', dataIndex: 'totalPushedQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '已发货数量', dataIndex: 'totalDispatchQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 4 - 1
src/views/salesManagement/salesQueryNew/stockOutDetailModal.vue

@@ -39,8 +39,9 @@
         </template>
       </s-table>
       <div class="btn-cont" style="padding:20px 20px 0;text-align: center;">
-        <!-- <a-button @click="isShow=false">关闭</a-button> -->
+        <a-button @click="isShow=false">取消</a-button>
         <a-button
+          style="margin-left: 10px"
           class="button-warning"
           type="primary"
           @click="handleExport"
@@ -49,6 +50,8 @@
           id="allocateBillList-export">导出Excel</a-button>
         <a-button
           style="margin-left: 5px"
+          class="button-warning"
+          type="primary"
           @click="handleClassifyExport"
           :disabled="disabled"
           :loading="exportClassifyLoading"