Bläddra i källkod

Merge branch 'develop_yh28' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh28

chenrui 1 år sedan
förälder
incheckning
6ecb2cd295
27 ändrade filer med 1287 tillägg och 1053 borttagningar
  1. 1 3
      src/components/global.less
  2. 6 6
      src/views/salesManagement/backorder/detailModal.vue
  3. 50 35
      src/views/salesManagement/backorder/list.vue
  4. 101 85
      src/views/salesManagement/examineVerify/list.vue
  5. 96 89
      src/views/salesManagement/matchSendOutOrder/list.vue
  6. 22 16
      src/views/salesManagement/outboundOrder/list.vue
  7. 8 3
      src/views/salesManagement/outboundOrder/sendGoodModal.vue
  8. 43 21
      src/views/salesManagement/priceInquiry/list.vue
  9. 1 1
      src/views/salesManagement/pushOrderManagement/detail.vue
  10. 8 8
      src/views/salesManagement/pushOrderManagement/detailForOut.vue
  11. 90 72
      src/views/salesManagement/receiptPrint/list.vue
  12. 31 28
      src/views/salesManagement/salesList/list.vue
  13. 1 1
      src/views/salesManagement/salesOrderWarehouse/detail.vue
  14. 1 1
      src/views/salesManagement/salesQueryNew/detail.vue
  15. 1 1
      src/views/salesManagement/salesQueryNew/edit.vue
  16. 4 1
      src/views/salesManagement/sendOutOrder/detailModal.vue
  17. 96 86
      src/views/salesManagement/sendOutOrder/list.vue
  18. 120 103
      src/views/salesManagement/shortageStatisticsC/list.vue
  19. 95 80
      src/views/salesManagement/shortageStatisticsP/list.vue
  20. 162 101
      src/views/salesManagement/stockPrint/list.vue
  21. 1 1
      src/views/salesReturnManagement/billOfLading/add.vue
  22. 26 26
      src/views/salesReturnManagement/billOfLading/detail.vue
  23. 74 63
      src/views/salesReturnManagement/billOfLading/list.vue
  24. 86 73
      src/views/salesReturnManagement/pickUp/list.vue
  25. 32 30
      src/views/salesReturnManagement/salesReturn/detail.vue
  26. 128 114
      src/views/salesReturnManagement/salesReturn/list.vue
  27. 3 5
      src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

+ 1 - 3
src/components/global.less

@@ -553,9 +553,7 @@ body {
       margin-right: 5px;
     }
   }
-  .ant-page-header-heading-sub-title{
-    margin:0;
-  }
+   
   // 统计样式白底黑子
   .tongji-bar{}
   // 底部按钮浮动栏

+ 6 - 6
src/views/salesManagement/backorder/detailModal.vue

@@ -7,14 +7,14 @@
     title="详情"
     v-model="isShow"
     @cancel="isShow=false"
-    width="80%">
+    width="70%">
     <a-spin :spinning="spinning" tip="Loading...">
       <div style="padding: 0 12px;text-align: right;" v-if="$hasPermissions('B_oosPrint')">
         <a-button id="backorderDetail-preview-btn" :disabled="localDataSource.length==0" @click="handlePrint('preview')" style="margin-right: 15px;">打印预览</a-button>
         <a-button type="primary" id="backorderDetail-print-btn" :disabled="localDataSource.length==0" @click="handlePrint('print')">快捷打印</a-button>
       </div>
       <!-- 基础信息 -->
-      <a-card size="small" :bordered="false" class="backorderDetail-cont">
+      <div style="padding: 10px 12px 0" class="backorderDetail-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="基础信息">
             <a-descriptions size="small" :column="2">
@@ -25,7 +25,7 @@
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>
-      </a-card>
+      </div>
       <a-card size="small" :bordered="false" class="backorderDetail-cont">
         <!-- alert -->
         <a-alert type="info" style="margin-bottom:10px">
@@ -112,9 +112,9 @@ export default {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', width: '15%', align: 'center', scopedSlots: { customRender: 'productCode' } },
-        { title: '产品名称', dataIndex: 'productEntity.name', width: '24%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '仓库', dataIndex: 'warehouseName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: '15%', align: 'left', scopedSlots: { customRender: 'productCode' } },
+        { title: '产品名称', dataIndex: 'productEntity.name', width: '27%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓库', dataIndex: 'warehouseName', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productEntity.origCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '缺货数量', dataIndex: 'qty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'productEntity.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }

+ 50 - 35
src/views/salesManagement/backorder/list.vue

@@ -1,46 +1,50 @@
 <template>
+  <div>
+  <a-card size="small" :bordered="false" class="backorderList-wrap">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="创建时间">
+              <rangeDate ref="rangeDate" @change="dateChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="客户名称">
+              <dealerSubareaScopeList ref="custList" id="backorderList-buyerSn" @change="custChange"></dealerSubareaScopeList>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="销售单号">
+              <a-input id="backorderList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :md="6" :sm="24">
+            <a-form-model-item label="仓库">
+              <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+            </a-form-model-item>
+          </a-col> -->
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="backorderList-refresh">查询</a-button>
+            <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="backorderList-reset">重置</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
   <a-card size="small" :bordered="false" class="backorderList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="创建时间">
-                <rangeDate ref="rangeDate" @change="dateChange" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="客户名称">
-                <dealerSubareaScopeList ref="custList" id="backorderList-buyerSn" @change="custChange"></dealerSubareaScopeList>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="销售单号">
-                <a-input id="backorderList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
-              </a-form-item>
-            </a-col>
-            <!-- <a-col :md="6" :sm="24">
-              <a-form-model-item label="仓库">
-                <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
-              </a-form-model-item>
-            </a-col> -->
-            <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="backorderList-refresh">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="backorderList-reset">重置</a-button>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+70+'px' }"
         size="small"
         :rowKey="(record) => record.no"
         rowKeyName="no"
         :columns="columns"
+        :pageSize="30"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
@@ -65,6 +69,7 @@
     <!-- 详情 -->
     <backorder-detail-modal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
   </a-card>
+</div>
 </template>
 
 <script>
@@ -118,8 +123,8 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', dataIndex: 'salesBillNo', width: '20%', align: 'center', scopedSlots: { customRender: 'salesBillNo' }},
-        { title: '客户名称', dataIndex: 'dealerName', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '销售单号', dataIndex: 'salesBillNo', width: '15%', align: 'center', scopedSlots: { customRender: 'salesBillNo' }},
+        { title: '客户名称', dataIndex: 'dealerName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         // { title: '仓库', dataIndex: 'warehouseName', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '缺货款数', dataIndex: 'totalCategory', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '缺货数量', dataIndex: 'totalQty', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -170,7 +175,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 203
+      this.tableHeight = window.innerHeight - tableSearchH - 202
     }
   },
   watch: {
@@ -201,3 +206,13 @@ export default {
   }
 }
 </script>
+<style lang="less">
+  .backorderList-wrap{
+    margin-bottom: 6px;
+    &:first-child{
+      .ant-card-body{
+        padding-bottom: 0;
+      }
+    }
+  }
+</style>

+ 101 - 85
src/views/salesManagement/examineVerify/list.vue

@@ -1,99 +1,101 @@
 <template>
+  <div>
   <a-card size="small" :bordered="false" class="examineVerifyList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="创建时间">
+              <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="客户名称">
+              <dealerSubareaScopeList ref="dealerSubareaScopeList" id="examineVerifyList-buyerName" @change="custChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="销售单号">
+              <a-input id="examineVerifyList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-item label="创建时间">
-                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+              <a-form-item label="出库单号">
+                <a-input id="examineVerifyList-stockOutNo" v-model.trim="queryParam.stockOutNo" allowClear placeholder="请输入出库单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="客户名称">
-                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="examineVerifyList-buyerName" @change="custChange" />
+              <a-form-item label="打印状态">
+                <v-select
+                  v-model="queryParam.printStatus"
+                  ref="printStatus"
+                  id="examineVerifyList-printStatus"
+                  code="PRINT_STATUS"
+                  placeholder="请选择打印状态"
+                  allowClear></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="销售单号">
-                <a-input id="examineVerifyList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  id="examineVerifyList-billStatus"
+                  code="DISPATCH_BILL_STATUS"
+                  placeholder="请选择单据状态"
+                  allowClear></v-select>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="出库单号">
-                  <a-input id="examineVerifyList-stockOutNo" v-model.trim="queryParam.stockOutNo" allowClear placeholder="请输入出库单号"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="打印状态">
-                  <v-select
-                    v-model="queryParam.printStatus"
-                    ref="printStatus"
-                    id="examineVerifyList-printStatus"
-                    code="PRINT_STATUS"
-                    placeholder="请选择打印状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="业务状态">
-                  <v-select
-                    v-model="queryParam.billStatus"
-                    ref="billStatus"
-                    id="examineVerifyList-billStatus"
-                    code="DISPATCH_BILL_STATUS"
-                    placeholder="请选择单据状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="备货单号">
-                  <a-input id="examineVerifyList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="所在区域">
-                  <subarea id="examineVerifyList-subarea" ref="subarea" @change="subareaChange"></subarea>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
-                  <Area id="examineVerifyList-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>
-            </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="examineVerifyList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="examineVerifyList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="备货单号">
+                <a-input id="examineVerifyList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+              </a-form-item>
             </a-col>
-          </a-row>
-        </a-form>
-      </div>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="所在区域">
+                <subarea id="examineVerifyList-subarea" ref="subarea" @change="subareaChange"></subarea>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
+                <Area id="examineVerifyList-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>
+          </template>
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="examineVerifyList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="examineVerifyList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 5px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
+  
+  <a-card size="small" :bordered="false" class="examineVerifyList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- alert -->
-      <a-alert type="info" style="margin-bottom:10px">
-        <div slot="message">
-          <span v-if="$hasPermissions('M_examineVerifyList_salesPrice')">总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;</span>
-          总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
-          总款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
-          总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
-        </div>
-      </a-alert>
+      <div class="tongji-bar">
+        <span v-if="$hasPermissions('M_examineVerifyList_salesPrice')">总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;</span>
+        总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
+        总款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
+        总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
+      </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"
@@ -152,6 +154,7 @@
       <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
     </commonModal>
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -245,10 +248,10 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据来源', dataIndex: 'salesBillEntity.salesBillSourceDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '10%', align: 'center' },
-        { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '10%', align: 'center' },
-        { title: '出库单号', dataIndex: 'stockOutNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'buyerName', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '9%', align: 'center' },
+        { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '9%', align: 'center' },
+        { title: '出库单号', dataIndex: 'stockOutNo', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'buyerName', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '售价', dataIndex: 'totalAmount', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '备货时间', dataIndex: 'stockUpDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -258,7 +261,7 @@ export default {
       ]
 	  // 仓库管理权限设置是否显示 (当客户有且只有一条仓库管理权限时,不显示仓库信息)
 	  if (this.isShowWarehouse) {
-	    arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouseName', width: '7%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
+	    arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
 	  }
       if (this.$hasPermissions('M_examineVerifyList_salesPrice')) { //  售价权限
         arr.splice(this.isShowWarehouse ? 9 : 8, 0, { title: '售价', dataIndex: 'totalAmount', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
@@ -373,7 +376,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 240
+      this.tableHeight = window.innerHeight - tableSearchH - 228
     }
   },
   watch: {
@@ -410,3 +413,16 @@ export default {
   }
 }
 </script>
+<style lang="less">
+  .examineVerifyList-wrap{
+    margin-bottom: 6px;
+    .sTable{
+      margin-top: 8px;
+    }
+    &:first-child{
+      .ant-card-body{
+        padding-bottom: 0;
+      }
+    }
+  }
+</style>

+ 96 - 89
src/views/salesManagement/matchSendOutOrder/list.vue

@@ -1,109 +1,111 @@
 <template>
   <div class="matchSoo-wrap">
-    <a-card style="margin-top: 5px;" size="small" :bordered="false">
-      <a-spin :spinning="spinning" tip="Loading...">
-        <!-- 搜索条件 -->
-        <div ref="tableSearch" class="table-page-search-wrapper">
-          <a-form layout="inline">
-            <a-row :gutter="15">
+    <a-card size="small" class="search-box" :bordered="false">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline">
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="创建时间">
+                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+              </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="dealerSubareaScopeList" id="matchSoo-buyerName" @change="custChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="销售单号">
+                <a-input id="matchSoo-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="matchSoo-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="创建时间">
-                  <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+                <a-form-item label="收货客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                  <dealerSubareaScopeList ref="shbuyerName" id="matchSoo-shbuyerName" @change="shcustChange" />
                 </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="dealerSubareaScopeList" id="matchSoo-buyerName" @change="custChange" />
+                <a-form-item label="业务状态">
+                  <v-select
+                    v-model="queryParam.billStatus"
+                    ref="billStatus"
+                    id="matchSoo-billStatus"
+                    code="DISPATCH_BILL_STATUS"
+                    placeholder="请选择业务状态"
+                    allowClear></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="销售单号">
-                  <a-input id="matchSoo-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+                <a-form-item label="单据状态">
+                  <v-select
+                    v-model="queryParam.voidFlag"
+                    ref="voidFlag"
+                    id="pushOrder-voidFlag"
+                    code="VOID_FLAG"
+                    placeholder="请选择单据状态"
+                    allowClear></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="备货单号">
-                  <a-input id="matchSoo-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+                <a-form-item label="对单状态">
+                  <v-select
+                    v-model="queryParam.checkStatus"
+                    ref="checkStatus"
+                    id="matchSoo-checkStatus"
+                    code="CHECK_STATUS"
+                    placeholder="请选择对单状态"
+                    allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <template v-if="advanced">
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="收货客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                    <dealerSubareaScopeList ref="shbuyerName" id="matchSoo-shbuyerName" @change="shcustChange" />
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="业务状态">
-                    <v-select
-                      v-model="queryParam.billStatus"
-                      ref="billStatus"
-                      id="matchSoo-billStatus"
-                      code="DISPATCH_BILL_STATUS"
-                      placeholder="请选择业务状态"
-                      allowClear></v-select>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="单据状态">
-                    <v-select
-                      v-model="queryParam.voidFlag"
-                      ref="voidFlag"
-                      id="pushOrder-voidFlag"
-                      code="VOID_FLAG"
-                      placeholder="请选择单据状态"
-                      allowClear></v-select>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="对单状态">
-                    <v-select
-                      v-model="queryParam.checkStatus"
-                      ref="checkStatus"
-                      id="matchSoo-checkStatus"
-                      code="CHECK_STATUS"
-                      placeholder="请选择对单状态"
-                      allowClear></v-select>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="对单时间">
-                    <rangeDate ref="checkDate" :value="checktime" @change="checkDateChange" />
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-model-item label="所在区域">
-                    <subarea id="matchSoo-subarea" ref="subarea" @change="subareaChange"></subarea>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
-                    <Area id="matchSoo-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>
-              </template>
-              <a-col :md="24" :sm="24">
-                <div class="table-page-search-submitButtons" style="text-align:center;">
-                  <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
-                  <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
-                  <a @click="advanced=!advanced" style="margin-left: 8px">
-                    {{ advanced ? '收起' : '展开' }}
-                    <a-icon :type="advanced ? 'up' : 'down'"/>
-                  </a>
-                </div>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="对单时间">
+                  <rangeDate ref="checkDate" :value="checktime" @change="checkDateChange" />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="所在区域">
+                  <subarea id="matchSoo-subarea" ref="subarea" @change="subareaChange"></subarea>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
+                  <Area id="matchSoo-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-row>
-          </a-form>
-        </div>
+            </template>
+            <a-col :md="24" :sm="24">
+              <div class="table-page-search-submitButtons" style="text-align:center;">
+                <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+                <a @click="advanced=!advanced" style="margin-left: 8px">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'"/>
+                </a>
+              </div>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+    <a-card style="margin-top: 5px;" size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
         <!-- 列表 -->
         <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"
@@ -222,11 +224,11 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '10%', align: 'center' },
-        { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '14%', align: 'center' },
+        { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '10%', align: 'center' },
         { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center' },
         { title: '客户名称', dataIndex: 'buyerName', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         // { title: '仓库', dataIndex: 'warehouseName', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '收货客户名称', dataIndex: 'receiverName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '收货客户名称', dataIndex: 'receiverName', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品款数', dataIndex: 'totalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品数量', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '总售价', dataIndex: 'totalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -384,5 +386,10 @@ export default {
     .ant-tabs-bar{
       margin:0;
     }
+    .search-box{
+      .ant-card-body{
+        padding-bottom: 0;
+      }
+    }
   }
 </style>

+ 22 - 16
src/views/salesManagement/outboundOrder/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="outboundOrderList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="outboundOrderList-wrap">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -86,12 +86,15 @@
           </a-row>
         </a-form>
       </div>
+    </a-card>
+  
+  <a-card size="small" :bordered="false" class="outboundOrderList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- 列表 -->
       <div style="margin-bottom: 10px">
         <a-button
           type="primary"
           v-if="$hasPermissions('B_stockOut')"
-          class="button-error"
           id="outboundOrder-export"
           :loading="loading"
           @click="handleOutbound()">批量出库</a-button>
@@ -109,7 +112,7 @@
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+70+'px' }"
         size="small"
         :rowKey="(record) => record.stockOutSn"
         rowKeyName="stockOutSn"
@@ -157,8 +160,8 @@
       v-model="openModal"
       v-if="openModal"
       @cancel="cancleModal"
-      width="80%">
-      <div style="max-height: 700px;overflow-y: scroll;">
+      width="70%">
+      <div>
         <pushOrderDetailModal v-if="outBizType=='SALES'" :outBizSubSn="orderSn" />
         <allocationDetailModal v-if="outBizType=='ALLOCATE'" :outBizSn="orderSn" />
       </div>
@@ -172,6 +175,7 @@
       @ok="sendSuccess"
       @cancel="showDetailModal=false"></sendGoodModal>
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -250,9 +254,9 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库单号', scopedSlots: { customRender: 'stockOutNo' }, width: '10%', align: 'center' },
-        { title: '业务单号', dataIndex: 'outBizNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务单号', dataIndex: 'outBizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'demanderName', width: '17%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'demanderName', width: '22%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         // { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '数量', dataIndex: 'productTotalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '售价', dataIndex: 'productTotalPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -477,7 +481,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 243
     }
   },
   watch: {
@@ -516,12 +520,14 @@ export default {
 </script>
 <style lang="less">
   .outboundOrderList-wrap{
-    .active{
-      color: #ed1c24;
-      cursor: pointer;
-    }
-    .common{
-      color: rgba(0, 0, 0);
-    }
+     margin-bottom: 6px;
+     .sTable{
+       margin-top: 8px;
+     }
+     &:first-child{
+       .ant-card-body{
+         padding-bottom: 0;
+       }
+     }
   }
 </style>

+ 8 - 3
src/views/salesManagement/outboundOrder/sendGoodModal.vue

@@ -11,9 +11,11 @@
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="common-main">
         <div style="display:flex;margin-bottom:10px;align-items: center;">
-          <a-button @click="showGlModal=true" type="primary" class="button-info" ghost v-if="isEdit">选择关联单据</a-button>
-          <div style="padding:0 15px;" v-if="sendBillStockOutList.length">
-            <div>{{ customeName }},共 {{ sendBillStockOutList && sendBillStockOutList.length }} 个出库单,产品款数合计 <span>{{ productTotal&&productTotal.totalCategory }}</span> ,产品数量合计 <span>{{ productTotal&&productTotal.totalQty }}</span>。</div>
+          <a-button @click="showGlModal=true" type="primary" style="margin-right:10px" ghost v-if="isEdit">选择关联单据</a-button>
+          <div v-if="sendBillStockOutList.length">
+            <a-alert type="info">
+              <div slot="message">{{ customeName }},共 {{ sendBillStockOutList && sendBillStockOutList.length }} 个出库单,产品款数合计 <span>{{ productTotal&&productTotal.totalCategory }}</span> ,产品数量合计 <span>{{ productTotal&&productTotal.totalQty }}</span>。</div>
+            </a-alert>
           </div>
         </div>
         <div style="margin-bottom:10px;" v-if="isEdit">
@@ -536,6 +538,9 @@ export default {
          display: flex;
          align-items: center;
          margin-bottom: 10px;
+         .ant-form-item{
+           margin-bottom: 5px;
+         }
          .ant-btn{
            margin-left: 30px;
          }

+ 43 - 21
src/views/salesManagement/priceInquiry/list.vue

@@ -1,4 +1,5 @@
 <template>
+  <div>
   <a-card size="small" :bordered="false" class="priceInquiryList-wrap">
     <!-- 搜索条件 -->
     <div ref="tableSearch" class="table-page-search-wrapper">
@@ -56,31 +57,37 @@
         </a-row>
       </a-form-model>
     </div>
-    <a-alert type="error" style="margin-bottom: 10px;" v-if="vinInfoData&&!vinInfoData.vinInfo">
-      <template slot="message"><a-icon type="exclamation-circle" theme="filled" :style="{ color: '#E70012', fontSize: '15px', verticalAlign: 'sub', marginRight: '3px' }" />抱歉!暂未找到匹配VIN码的车型!</template>
-    </a-alert>
-    <a-alert type="warning" style="margin-bottom: 10px;cursor: pointer;" v-if="vinInfoData&&vinInfoData.vinInfo" @click="openCarInfoModal=true">
-      <template slot="message">
-        <div style="display: flex;justify-content: space-between;align-items: center;" @click="openCarInfoModal=true">
-          <div>
-            <img :src="vinInfoData.vinInfo && vinInfoData.vinInfo.icon?(vinInfoData.vinInfo.icon+'?x-oss-process=image/resize,h_30,m_lfit'):defImg" width="30" height="30" class="imageUrl" style="border-radius: 50%;vertical-align: middle;margin-right: 3px;" />
-            <span style="vertical-align: middle;">{{ vinInfoData.vinInfo.text }}</span>
-          </div>
-          <div style="color: #f90;">
-            <span>查看更多</span> >
+  </a-card>
+  
+  <a-card size="small" :bordered="false" class="priceInquiryList-wrap">
+    <div ref="vinInfo" v-if="vinInfoData">
+      <a-alert type="error" style="margin-bottom: 10px;" v-if="vinInfoData&&!vinInfoData.vinInfo">
+        <template slot="message"><a-icon type="exclamation-circle" theme="filled" :style="{ color: '#E70012', fontSize: '15px', verticalAlign: 'sub', marginRight: '3px' }" />抱歉!暂未找到匹配VIN码的车型!</template>
+      </a-alert>
+      <a-alert type="warning" style="margin-bottom: 10px;cursor: pointer;" v-if="vinInfoData&&vinInfoData.vinInfo" @click="openCarInfoModal=true">
+        <template slot="message">
+          <div style="display: flex;justify-content: space-between;align-items: center;" @click="openCarInfoModal=true">
+            <div>
+              <img :src="vinInfoData.vinInfo && vinInfoData.vinInfo.icon?(vinInfoData.vinInfo.icon+'?x-oss-process=image/resize,h_30,m_lfit'):defImg" width="30" height="30" class="imageUrl" style="border-radius: 50%;vertical-align: middle;margin-right: 3px;" />
+              <span style="vertical-align: middle;">{{ vinInfoData.vinInfo.text }}</span>
+            </div>
+            <div style="color: #f90;">
+              <span>查看更多</span> >
+            </div>
           </div>
-        </div>
-      </template>
-    </a-alert>
+        </template>
+      </a-alert>
+    </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"
       :data="loadData"
+      :pageSize="30"
       :scroll="{ y: tableHeight }"
       :defaultLoadData="false"
       bordered>
@@ -104,6 +111,7 @@
     <!-- 查看车辆信息 -->
     <car-info-modal v-drag ref="carInfoModal" :openModal="openCarInfoModal" :infoData="vinInfoData&&vinInfoData.vinInfo" @close="openCarInfoModal=false" />
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -307,17 +315,21 @@ export default {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 200
+      if(this.vinInfoData){
+        const vinInfoH = this.$refs.vinInfo.offsetHeight
+        this.tableHeight = this.tableHeight - vinInfoH
+      }
     }
   },
   watch: {
     advanced (newValue, oldValue) {
-      const _this = this
-      this.$nextTick(() => { // 页面渲染完成后的回调
-        _this.setTableH()
-      })
+      this.pageInit()
+    },
+    vinInfoData(){
+      this.pageInit()
     },
     '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
-      this.setTableH()
+      this.pageInit()
     }
   },
   mounted () {
@@ -343,3 +355,13 @@ export default {
   }
 }
 </script>
+<style lang="less">
+  .priceInquiryList-wrap{
+     margin-bottom: 6px;
+     &:first-child{
+       .ant-card-body{
+         padding-bottom: 0;
+       }
+     }
+  }
+</style>

+ 1 - 1
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -6,7 +6,7 @@
           <a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
           <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.dispatchBillNo }}</span>
           <span style="margin: 0 10px;color: #666;">客户名称:{{ detailData&&detailData.buyerName }}</span>
-          <a-button type="link" class="button-default" @click="showDetail=!showDetail">
+          <a-button type="link" size="small" class="button-default" @click="showDetail=!showDetail">
             <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
           </a-button>
         </template>

+ 8 - 8
src/views/salesManagement/pushOrderManagement/detailForOut.vue

@@ -147,9 +147,9 @@ export default {
       spinning: false,
       outColumns: [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '25%', scopedSlots: { customRender: 'productCode' }, align: 'center' },
-        { title: '产品名称', dataIndex: 'productName', width: '33%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: '25%', scopedSlots: { customRender: 'productCode' }, align: 'left' },
+        { title: '产品名称', dataIndex: 'productName', width: '33%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productOrigUnit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '本次出库数', dataIndex: 'qty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],
@@ -194,9 +194,9 @@ export default {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '19%', scopedSlots: { customRender: 'productCode' }, align: 'center' },
-        { title: '产品名称', dataIndex: 'productName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: '19%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: '19%', scopedSlots: { customRender: 'productCode' }, align: 'left' },
+        { title: '产品名称', dataIndex: 'productName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '19%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productOrigUnit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         // { title: '销售价格', dataIndex: 'price', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '市级销售价格', dataIndex: 'cityPrice', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -331,8 +331,8 @@ export default {
 
 <style lang="less">
   .salesDetail-wrap{
-    .salesDetail-cont{
-      margin-bottom: 10px;
+    .ant-card-body:first-child{
+      padding-bottom: 0;
     }
     .footer-cont{
       margin-top: 5px;

+ 90 - 72
src/views/salesManagement/receiptPrint/list.vue

@@ -8,70 +8,76 @@
         </a-tab-pane>
       </a-tabs>
     </div>
+    <a-card style="margin-top: 5px;" size="small" class="search-box" :bordered="false">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline">
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="允许打印时间">
+                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="收款单号">
+                <a-input id="salesCollectionList-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入备货单号"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="客户名称">
+                <dealerSearchList ref="payerName" id="alesCollectionList-payerName" @change="custChange" />
+              </a-form-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" v-if="currentTab == 1">
+              <a-form-item label="收款打印状态">
+                <v-select
+                  v-model="queryParam.printStatus"
+                  ref="printStatus"
+                  id="salesCollectionList-printStatus"
+                  code="PRINT_STATUS"
+                  placeholder="请选择打印状态"
+                  allowClear
+                ></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="足额打款">
+                <v-select
+                  v-model="queryParam.fullPaymentFlag"
+                  ref="fullPaymentFlag"
+                  id="salesCollectionList-fullPaymentFlag"
+                  code="FLAG"
+                  placeholder="请选择是否足额打款"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <span class="table-page-search-submitButtons">
+                <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+                <!-- <a @click="advanced=!advanced" style="margin-left: 8px">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'"/>
+                </a> -->
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
     <a-card style="margin-top: 5px;" size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
-        <!-- 搜索条件 -->
-        <div ref="tableSearch" class="table-page-search-wrapper">
-          <a-form layout="inline">
-            <a-row :gutter="15">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="允许打印时间">
-                  <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="收款单号">
-                  <a-input id="salesCollectionList-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入备货单号"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="客户名称">
-                  <dealerSearchList ref="payerName" id="alesCollectionList-payerName" @change="custChange" />
-                </a-form-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" v-if="currentTab == 1">
-                <a-form-item label="收款打印状态">
-                  <v-select
-                    v-model="queryParam.printStatus"
-                    ref="printStatus"
-                    id="salesCollectionList-printStatus"
-                    code="PRINT_STATUS"
-                    placeholder="请选择打印状态"
-                    allowClear
-                  ></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="足额打款">
-                  <v-select
-                    v-model="queryParam.fullPaymentFlag"
-                    ref="fullPaymentFlag"
-                    id="salesCollectionList-fullPaymentFlag"
-                    code="FLAG"
-                    placeholder="请选择是否足额打款"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <span class="table-page-search-submitButtons">
-                  <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
-                  <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
-                </span>
-              </a-col>
-            </a-row>
-          </a-form>
-          <!-- 操作按钮 -->
-          <div class="table-operator" v-if="$hasPermissions('B_SkPrint')">
-            <a-button type="primary" :loading="spinning" @click="handlePlPrint()" class="button-error">批量打印</a-button>
-            <span style="margin-left: 8px">
-              <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
-            </span>
-          </div>
+        <!-- 操作按钮 -->
+        <div class="table-operator" v-if="$hasPermissions('B_SkPrint')">
+          <a-button type="primary" :loading="spinning" @click="handlePlPrint()" class="button-error">批量打印</a-button>
+          <span style="margin-left: 8px">
+            <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
+          </span>
         </div>
         <!-- 列表 -->
         <s-table
@@ -209,12 +215,11 @@ export default {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '允许打印时间', dataIndex: 'allowPrintTime', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '允许打印时间', dataIndex: 'allowPrintTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收款单号', dataIndex: 'bookNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收款日期', dataIndex: 'receiptDate', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'payerName', align: 'left', width: '14%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        // { title: '仓库', dataIndex: 'warehouseName', align: 'left', width: '14%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '财务编码', dataIndex: 'dealerEntity.kdMidCustomerFnumber', align: 'left', width: '10%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '收款日期', dataIndex: 'receiptDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'payerName', align: 'left', width: '20%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '财务编码', dataIndex: 'dealerEntity.kdMidCustomerFnumber', align: 'center', width: '10%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '订单金额', dataIndex: 'orderAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '收款金额', dataIndex: 'receiptAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '使用授信', dataIndex: 'useCreditAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
@@ -228,11 +233,22 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
       ]
       if (this.isShowWarehouse) {
-        arr.splice(5, 0, { title: '仓库', dataIndex: 'warehouseName', align: 'center', width: '14%', customRender: function (text) { return text || '--' }, ellipsis: true })
+        arr.splice(5, 0, { title: '仓库', dataIndex: 'warehouseName', align: 'center', width: '10%', customRender: function (text) { return text || '--' }, ellipsis: true })
       }
       return arr
     }
   },
+  watch: {
+    advanced (newValue, oldValue) {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   methods: {
     changeTab (v) {
       this.currentTab = v
@@ -432,7 +448,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 250
+      this.tableHeight = window.innerHeight - tableSearchH - 296
     }
   },
   watch: {
@@ -465,11 +481,13 @@ export default {
 </script>
 <style lang="less">
   .receiptPrint-wrap{
-    .sTable{
-      margin-top: 10px;
-    }
     .ant-tabs-bar{
       margin:0;
     }
+    .search-box{
+      .ant-card-body{
+        padding-bottom: 0;
+      }
+    }
   }
 </style>

+ 31 - 28
src/views/salesManagement/salesList/list.vue

@@ -27,12 +27,12 @@
                 <subarea id="salesList-subarea" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesList-buyerName" @change="custChange" />
-              </a-form-model-item>
-            </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                  <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesList-buyerName" @change="custChange" />
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="财务状态">
                   <v-select
@@ -111,11 +111,12 @@
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+85+'px' }"
           size="small"
           :rowKey="(record) => record.no"
           rowKeyName="no"
           :columns="columns"
+          :pageSize="30"
           :data="loadData"
           :scroll="{ y:tableHeight, x:1890 }"
           :defaultLoadData="false"
@@ -250,25 +251,25 @@ export default {
       const _this = this
       const arr = [
         { title: '超时环节提醒', scopedSlots: { customRender: 'tip' }, width: '160px', align: 'center', fixed: 'left' },
-        { title: '提交时间', dataIndex: 'submitDate', width: '130px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
+        { title: '提交时间', dataIndex: 'submitDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
         { title: '省份', dataIndex: 'provinceName', align: 'center', width: '80px', customRender: function (text) { return text || '--' }, fixed: 'left' },
-        { title: '客户名称', dataIndex: 'buyerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true, fixed: 'left' },
+        { title: '客户名称', dataIndex: 'buyerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true, fixed: 'left' },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '120px', align: 'center', fixed: 'left' },
         { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '120px', align: 'center' },
         { title: '发货单号', scopedSlots: { customRender: 'sendBillNo' }, width: '120px', align: 'center' },
         { title: '所在区域', dataIndex: 'subareaName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所在分区', dataIndex: 'subareaAreaName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '仓库', dataIndex: 'warehouseName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '收货客户名称', dataIndex: 'receiverName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '收款方式', dataIndex: 'settleStyleDictValue', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: '130px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '收货客户名称', dataIndex: 'receiverName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '收款方式', dataIndex: 'settleStyleDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
 
-        { title: '审核时间', dataIndex: 'auditDate', width: '130px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '下推数量', dataIndex: 'dispatchTotalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '下推金额', dataIndex: 'dispatchTotalAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
         { title: '收款金额', dataIndex: 'dispatchSettledAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
-        { title: '收款时间', dataIndex: 'dispatchSettleTime', width: '130px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款时间', dataIndex: 'dispatchSettleTime', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
 
-        { title: '备货允许打印时间', dataIndex: 'dispatchAllowPrintTime', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '备货允许打印时间', dataIndex: 'dispatchAllowPrintTime', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备货时间', dataIndex: 'dispatchAuditDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货编号', dataIndex: 'dispatchSendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货创建时间', dataIndex: 'sendCreateDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
@@ -405,7 +406,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 236
+      this.tableHeight = window.innerHeight - tableSearchH - 220
     }
   },
   watch: {
@@ -440,21 +441,23 @@ export default {
   }
 }
 </script>
-<style lang="less" scoped>
+<style lang="less">
   .salesList-wrap{
-    .sTable{
-      margin-top: 10px;
-    }
-  }
-  .statusBox{
-    span{
-      vertical-align:top;
-         }
-    span::after{
-      content:'/';
+    &:first-child{
+      .ant-card-body{
+        padding-bottom: 0;
+      }
     }
-    span:last-child::after{
-       content:'' !important;
+    .statusBox{
+      span{
+        vertical-align:top;
+           }
+      span::after{
+        content:'/';
+      }
+      span:last-child::after{
+         content:'' !important;
+      }
     }
   }
 </style>

+ 1 - 1
src/views/salesManagement/salesOrderWarehouse/detail.vue

@@ -7,7 +7,7 @@
           <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-button type="link" size="small" class="button-default" @click="showDetail=!showDetail">
             <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
           </a-button>
         </template>

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

@@ -7,7 +7,7 @@
           <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-button size="small" type="link" class="button-default" @click="showDetail=!showDetail">
             <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
           </a-button>
         </template>

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

@@ -8,7 +8,7 @@
           <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-button type="link" size="small" class="button-default" @click="showDetail=!showDetail">
             <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
           </a-button>
         </template>

+ 4 - 1
src/views/salesManagement/sendOutOrder/detailModal.vue

@@ -306,11 +306,14 @@ export default {
        }
        .forms{
          flex-wrap: wrap;
+         border:1px solid #eee;
+         border-radius: 3px;
+         padding: 5px;
        }
        .forms > div{
          flex-grow: 1;
          flex-basis: 50%;
-         padding: 10px;
+         padding: 6px 10px;
          display: flex;
          align-items: center;
          > label{

+ 96 - 86
src/views/salesManagement/sendOutOrder/list.vue

@@ -1,105 +1,108 @@
 <template>
+  <div>
   <a-card size="small" :bordered="false" class="sendOut-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline">
-          <a-row :gutter="15">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="创建时间">
+              <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="发货单号">
+              <a-input id="sendOut-sendBillNo" v-model.trim="queryParam.sendBillNo" 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}">
+              <a-input id="sendOut-customeName" v-model.trim="queryParam.customeName" allowClear placeholder="请输入客户名称"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="关联业务单号">
+                <a-input id="sendOut-bizNos" v-model.trim="queryParam.bizNos" allowClear placeholder="请输入备货或调拨单号"/>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="创建时间">
-                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+              <a-form-item label="托运日期">
+                <rangeDate ref="sendDate" :value="sendtime" @change="sendDateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="发货单号">
-                <a-input id="sendOut-sendBillNo" v-model.trim="queryParam.sendBillNo" allowClear placeholder="请输入发货单号"/>
+              <a-form-item label="收货状态">
+                <v-select
+                  v-model="queryParam.receiveFlag"
+                  ref="receiveFlag"
+                  id="sendOut-receiveFlag"
+                  code="RECEIVE_FLAG"
+                  placeholder="请选择收货状态"
+                  allowClear></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <a-input id="sendOut-customeName" v-model.trim="queryParam.customeName" allowClear placeholder="请输入客户名称"/>
+              <a-form-item label="物流情况">
+                <v-select
+                  v-model="queryParam.transportState"
+                  ref="transportState"
+                  id="sendOut-transportState"
+                  code="TRANSPORT_STATE"
+                  placeholder="请选择物流情况"
+                  allowClear></v-select>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="关联业务单号">
-                  <a-input id="sendOut-bizNos" v-model.trim="queryParam.bizNos" allowClear placeholder="请输入备货或调拨单号"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="托运日期">
-                  <rangeDate ref="sendDate" :value="sendtime" @change="sendDateChange" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="收货状态">
-                  <v-select
-                    v-model="queryParam.receiveFlag"
-                    ref="receiveFlag"
-                    id="sendOut-receiveFlag"
-                    code="RECEIVE_FLAG"
-                    placeholder="请选择收货状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="物流情况">
-                  <v-select
-                    v-model="queryParam.transportState"
-                    ref="transportState"
-                    id="sendOut-transportState"
-                    code="TRANSPORT_STATE"
-                    placeholder="请选择物流情况"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="所在区域">
-                  <subarea id="sendOut-subarea" ref="subarea" @change="subareaChange"></subarea>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="地区" >
-                  <Area id="sendOut-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="仓库">
-                  <chooseWarehouse ref="warehouse" @load="warehouseLoad" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
-                </a-form-model-item>
-              </a-col>
-            </template>
             <a-col :md="6" :sm="24">
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
-                <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
-                <a-button
-                  style="margin-left: 10px"
-                  type="primary"
-                  class="button-warning"
-                  @click="handleExport"
-                  :disabled="disabled"
-                  :loading="exportLoading"
-                  v-if="$hasPermissions('B_sendOutExport')"
-                  id="sendOut-export">导出</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 8px">
-                  {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
-              </span>
+              <a-form-model-item label="所在区域">
+                <subarea id="sendOut-subarea" ref="subarea" @change="subareaChange"></subarea>
+              </a-form-model-item>
             </a-col>
-          </a-row>
-        </a-form>
-        <!-- 操作按钮 -->
-        <div v-if="isShowImport">
-          <a-button type="primary" class="button-error" v-if="$hasPermissions('B_sendOutPlImport')" @click="openGuideModal=true">批量导入</a-button>
-        </div>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="地区" >
+                <Area id="sendOut-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="仓库">
+                <chooseWarehouse ref="warehouse" @load="warehouseLoad" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
+              </a-form-model-item>
+            </a-col>
+          </template>
+          <a-col :md="6" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+              <a-button
+                style="margin-left: 10px"
+                type="primary"
+                class="button-warning"
+                @click="handleExport"
+                :disabled="disabled"
+                :loading="exportLoading"
+                v-if="$hasPermissions('B_sendOutExport')"
+                id="sendOut-export">导出</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 8px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
+  <a-card size="small" :bordered="false" class="sendOut-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <!-- 操作按钮 -->
+      <div v-if="isShowImport">
+        <a-button type="primary" class="button-error" v-if="$hasPermissions('B_sendOutPlImport')" @click="openGuideModal=true">批量导入</a-button>
       </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"
@@ -145,6 +148,7 @@
     <!-- 导入发货单 -->
     <importGuideModal v-drag :openModal="openGuideModal" @close="openGuideModal=false" @ok="resetSearchForm" />
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -324,7 +328,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 208
+      this.tableHeight = window.innerHeight - tableSearchH - 210 - (this.isShowImport ? 30 : 0)
     }
   },
   watch: {
@@ -363,8 +367,14 @@ export default {
 </script>
 <style lang="less">
   .sendOut-wrap{
+    margin-bottom: 6px;
     .sTable{
-      margin-top: 10px;
+      margin-top: 8px;
+    }
+    &:first-child{
+      .ant-card-body{
+        padding-bottom: 0;
+      }
     }
   }
 </style>

+ 120 - 103
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -1,123 +1,126 @@
 <template>
+  <div>
   <a-card size="small" :bordered="false" class="shortageStatisticsCList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="创建时间">
+              <rangeDate ref="rangeDate" :allowClear="false" :value="time" @change="dateChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="产品名称">
+              <a-input id="shortageStatisticsCList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="产品编码">
+              <a-input id="shortageStatisticsCList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-item label="创建时间">
-                <rangeDate ref="rangeDate" :allowClear="false" :value="time" @change="dateChange" />
+              <a-form-item label="客户名称">
+                <dealerSubareaScopeList ref="custList" id="shortageStatisticsCList-buyerSn" :itemSn="queryParam.buyerSn" @change="custChange"></dealerSubareaScopeList>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="shortageStatisticsCList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="区域">
+                <subarea id="shortageStatisticsCList-subarea" ref="subarea" @change="subareaChange"></subarea>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码">
-                <a-input id="shortageStatisticsCList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+              <a-form-model-item label="省份" prop="provinceSn">
+                <Area id="shortageStatisticsCList-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品分类">
+                <ProductType v-model="productType" id="shortageStatisticsCList-productType" @change="changeProductType" placeholder="请选择产品分类"></ProductType>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="客户名称">
-                  <dealerSubareaScopeList ref="custList" id="shortageStatisticsCList-buyerSn" :itemSn="queryParam.buyerSn" @change="custChange"></dealerSubareaScopeList>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="区域">
-                  <subarea id="shortageStatisticsCList-subarea" ref="subarea" @change="subareaChange"></subarea>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="省份" prop="provinceSn">
-                  <Area id="shortageStatisticsCList-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="产品分类">
-                  <ProductType v-model="productType" id="shortageStatisticsCList-productType" @change="changeProductType" placeholder="请选择产品分类"></ProductType>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="品牌">
-                  <ProductBrand id="shortageStatisticsCList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="品牌分类">
-                  <v-select code="BRAND_TYPE" id="shortageStatisticsCList-brandType" v-model="queryParam.brandType" allowClear placeholder="请选择品牌分类"></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="销售单号">
-                  <a-input id="shortageStatisticsCList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="客户类型">
-                  <v-select code="DEALER_TYPE" id="shortageStatisticsCList-dealerType" v-model="queryParam.dealerType" allowClear placeholder="请选择客户类型"></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="产品状态">
-                  <v-select code="PRODUCT_STATUS" id="shortageStatisticsCList-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="仓库">
-                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
-                </a-form-model-item>
-              </a-col>
-            </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 8px;">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsCList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="shortageStatisticsCList-reset">重置</a-button>
-              <a-button
-                style="margin-left: 5px"
-                type="primary"
-                class="button-warning"
-                @click="handleExport"
-                :disabled="disabled"
-                :loading="exportLoading"
-                v-if="$hasPermissions('B_oosDetailExportByBuyer')"
-                id="shortageStatisticsCList-export">导出</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="品牌">
+                <ProductBrand id="shortageStatisticsCList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+              </a-form-item>
             </a-col>
-          </a-row>
-        </a-form>
-      </div>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="品牌分类">
+                <v-select code="BRAND_TYPE" id="shortageStatisticsCList-brandType" v-model="queryParam.brandType" allowClear placeholder="请选择品牌分类"></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="销售单号">
+                <a-input id="shortageStatisticsCList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="客户类型">
+                <v-select code="DEALER_TYPE" id="shortageStatisticsCList-dealerType" v-model="queryParam.dealerType" allowClear placeholder="请选择客户类型"></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品状态">
+                <v-select code="PRODUCT_STATUS" id="shortageStatisticsCList-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="仓库">
+                <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+              </a-form-model-item>
+            </a-col>
+          </template>
+          <a-col :md="6" :sm="24" style="margin-bottom: 8px;">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsCList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="shortageStatisticsCList-reset">重置</a-button>
+            <a-button
+              style="margin-left: 5px"
+              type="primary"
+              class="button-warning"
+              @click="handleExport"
+              :disabled="disabled"
+              :loading="exportLoading"
+              v-if="$hasPermissions('B_oosDetailExportByBuyer')"
+              id="shortageStatisticsCList-export">导出</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 5px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
+  <a-card size="small" :bordered="false" class="shortageStatisticsCList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- alert -->
-      <a-alert type="info" style="margin-bottom:10px">
-        <div slot="message">
-          <div>
-            总客户数:<strong>{{ productTotal && (productTotal.totalBuyerQty || productTotal.totalBuyerQty==0) ? productTotal.totalBuyerQty : '--' }}</strong>,
-            总单数:<strong>{{ productTotal && (productTotal.totalRecord || productTotal.totalRecord==0) ? productTotal.totalRecord : '--' }}</strong>,
-            缺货总款数:<strong>{{ productTotal && (productTotal.totalCategory || productTotal.totalCategory==0) ? productTotal.totalCategory : '--' }}</strong>,
-            缺货总数量:<strong>{{ productTotal && (productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--' }}</strong>,
-            <span v-if="$hasPermissions('M_shortageStatisticsCList_salesPrice')">缺货总金额:<strong>{{ productTotal && (productTotal.totalAmount || productTotal.totalAmount==0) ? toThousands(productTotal.totalAmount) : '--' }}</strong></span>
-          </div>
-          <div>
-            本页客户数:<strong>{{ currentTotal && (currentTotal.totalBuyerQty || currentTotal.totalBuyerQty==0) ? currentTotal.totalBuyerQty : '--' }}</strong>,
-            本页总单数:<strong>{{ currentTotal && (currentTotal.totalRecord || currentTotal.totalRecord==0) ? currentTotal.totalRecord : '--' }}</strong>,
-            本页缺货总款数:<strong>{{ currentTotal && (currentTotal.totalCategory || currentTotal.totalCategory==0) ? currentTotal.totalCategory : '--' }}</strong>,
-            本页缺货总数量:<strong>{{ currentTotal && (currentTotal.totalQty || currentTotal.totalQty==0) ? currentTotal.totalQty : '--' }}</strong>,
-            <span v-if="$hasPermissions('M_shortageStatisticsCList_salesPrice')">本页缺货总金额:<strong>{{ currentTotal && (currentTotal.totalAmount || currentTotal.totalAmount==0) ? toThousands(currentTotal.totalAmount) : '--' }}</strong></span>
-          </div>
-        </div></a-alert>
+      <div class="tongji-bar">
+        <div>
+          总客户数:<strong>{{ productTotal && (productTotal.totalBuyerQty || productTotal.totalBuyerQty==0) ? productTotal.totalBuyerQty : '--' }}</strong>,
+          总单数:<strong>{{ productTotal && (productTotal.totalRecord || productTotal.totalRecord==0) ? productTotal.totalRecord : '--' }}</strong>,
+          缺货总款数:<strong>{{ productTotal && (productTotal.totalCategory || productTotal.totalCategory==0) ? productTotal.totalCategory : '--' }}</strong>,
+          缺货总数量:<strong>{{ productTotal && (productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--' }}</strong>,
+          <span v-if="$hasPermissions('M_shortageStatisticsCList_salesPrice')">缺货总金额:<strong>{{ productTotal && (productTotal.totalAmount || productTotal.totalAmount==0) ? toThousands(productTotal.totalAmount) : '--' }}</strong></span>
+        </div>
+        <div>
+          本页客户数:<strong>{{ currentTotal && (currentTotal.totalBuyerQty || currentTotal.totalBuyerQty==0) ? currentTotal.totalBuyerQty : '--' }}</strong>,
+          本页总单数:<strong>{{ currentTotal && (currentTotal.totalRecord || currentTotal.totalRecord==0) ? currentTotal.totalRecord : '--' }}</strong>,
+          本页缺货总款数:<strong>{{ currentTotal && (currentTotal.totalCategory || currentTotal.totalCategory==0) ? currentTotal.totalCategory : '--' }}</strong>,
+          本页缺货总数量:<strong>{{ currentTotal && (currentTotal.totalQty || currentTotal.totalQty==0) ? currentTotal.totalQty : '--' }}</strong>,
+          <span v-if="$hasPermissions('M_shortageStatisticsCList_salesPrice')">本页缺货总金额:<strong>{{ currentTotal && (currentTotal.totalAmount || currentTotal.totalAmount==0) ? toThousands(currentTotal.totalAmount) : '--' }}</strong></span>
+        </div>
+      </div>
       <!-- 列表 -->
       <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"
+        :pageSize="30"
         :columns="columns"
         :data="loadData"
         :defaultLoadData="false"
@@ -135,6 +138,7 @@
       </s-table>
     </a-spin>
   </a-card>
+</div>
 </template>
 
 <script>
@@ -218,7 +222,7 @@ export default {
       const arr = [
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: 130, align: 'center' },
+        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: 110, align: 'center' },
         { title: '省份', dataIndex: 'dealerEntity.provinceName', width: 80, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: 140, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓库', dataIndex: 'warehouseName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -227,7 +231,7 @@ export default {
         { title: '品牌', dataIndex: 'productEntity.productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '二级分类', dataIndex: 'productEntity.productTypeName2', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: 180, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center', scopedSlots: { customRender: 'productCode' } },
+        { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'left', scopedSlots: { customRender: 'productCode' } },
         { title: '单位', dataIndex: 'productEntity.unit', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品状态', dataIndex: 'productEntity.stateDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '缺货数量', dataIndex: 'qty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -365,7 +369,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 255
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {
@@ -402,3 +406,16 @@ export default {
   }
 }
 </script>
+<style lang="less">
+  .shortageStatisticsCList-wrap{
+     margin-bottom: 6px;
+     .sTable{
+       margin-top: 8px;
+     }
+     &:first-child{
+       .ant-card-body{
+         padding-bottom: 0;
+       }
+     }
+  }
+</style>

+ 95 - 80
src/views/salesManagement/shortageStatisticsP/list.vue

@@ -1,100 +1,101 @@
 <template>
+  <div>
   <a-card size="small" :bordered="false" class="shortageStatisticsPList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="创建时间">
+              <rangeDate ref="rangeDate" :allowClear="false" :value="time" @change="dateChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="产品编码">
+              <a-input id="shortageStatisticsPList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="产品名称">
+              <a-input id="shortageStatisticsPList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-item label="创建时间">
-                <rangeDate ref="rangeDate" :allowClear="false" :value="time" @change="dateChange" />
+              <a-form-item label="原厂编码">
+                <a-input id="shortageStatisticsPList-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码">
-                <a-input id="shortageStatisticsPList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
-              </a-form-item>
+              <a-form-model-item label="仓库">
+                <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+              </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="shortageStatisticsPList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="产品状态">
+                <v-select code="OOS_PRODUCT_STATE" id="shortageStatisticsPList-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="原厂编码">
-                  <a-input id="shortageStatisticsPList-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="仓库">
-                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="产品状态">
-                  <v-select code="OOS_PRODUCT_STATE" id="shortageStatisticsPList-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="停产状态">
-                  <a-select v-model="queryParam.haltProdFlag" placeholder="请选择停产状态" allowClear>
-                    <a-select-option value="0">
-                      启用
-                    </a-select-option>
-                    <a-select-option value="1">
-                      停产
-                    </a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-            </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsPList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="shortageStatisticsPList-reset">重置</a-button>
-              <a-button
-                style="margin-left: 5px"
-                type="primary"
-                class="button-warning"
-                @click="handleExport"
-                :disabled="disabled"
-                :loading="exportLoading"
-                v-if="$hasPermissions('B_oosDetailExportByProduct')"
-                id="shortageStatisticsCList-export">导出</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="停产状态">
+                <a-select v-model="queryParam.haltProdFlag" placeholder="请选择停产状态" allowClear>
+                  <a-select-option value="0">
+                    启用
+                  </a-select-option>
+                  <a-select-option value="1">
+                    停产
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
             </a-col>
-          </a-row>
-        </a-form>
-      </div>
+          </template>
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsPList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="shortageStatisticsPList-reset">重置</a-button>
+            <a-button
+              style="margin-left: 5px"
+              type="primary"
+              class="button-warning"
+              @click="handleExport"
+              :disabled="disabled"
+              :loading="exportLoading"
+              v-if="$hasPermissions('B_oosDetailExportByProduct')"
+              id="shortageStatisticsCList-export">导出</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 5px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
+  <a-card size="small" :bordered="false" class="shortageStatisticsPList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- alert -->
-      <a-alert type="info" style="margin-bottom:10px">
-        <div slot="message">
-          <div>
-            总缺货数量:<strong>{{ productTotal && (productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--' }}</strong>,
-            <span v-if="$hasPermissions('M_shortageStatisticsPList_salesPrice')">
-              总缺货金额:<strong>{{ productTotal && (productTotal.totalAmount || productTotal.totalAmount==0) ? toThousands(productTotal.totalAmount) : '--' }}</strong>
-            </span>
-          </div>
-          <div>
-            本页缺货数量:<strong>{{ currentTotal && (currentTotal.totalQty || currentTotal.totalQty==0) ? currentTotal.totalQty : '--' }}</strong>,
-            <span v-if="$hasPermissions('M_shortageStatisticsPList_salesPrice')">
-              本页缺货金额:<strong>{{ currentTotal && (currentTotal.totalAmount || currentTotal.totalAmount==0) ? toThousands(currentTotal.totalAmount) : '--' }}</strong>
-            </span>
-          </div>
-        </div></a-alert>
+      <div class="tongji-bar">
+        <div>
+          总缺货数量:<strong>{{ productTotal && (productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--' }}</strong>,
+          <span v-if="$hasPermissions('M_shortageStatisticsPList_salesPrice')">
+            总缺货金额:<strong>{{ productTotal && (productTotal.totalAmount || productTotal.totalAmount==0) ? toThousands(productTotal.totalAmount) : '--' }}</strong>;
+          </span>
+          本页缺货数量:<strong>{{ currentTotal && (currentTotal.totalQty || currentTotal.totalQty==0) ? currentTotal.totalQty : '--' }}</strong>,
+          <span v-if="$hasPermissions('M_shortageStatisticsPList_salesPrice')">
+            本页缺货金额:<strong>{{ currentTotal && (currentTotal.totalAmount || currentTotal.totalAmount==0) ? toThousands(currentTotal.totalAmount) : '--' }}</strong>;
+          </span>
+        </div>
+      </div>
       <!-- 列表 -->
       <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"
         :data="loadData"
+        :pageSize="30"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         bordered>
@@ -106,6 +107,7 @@
       </s-table>
     </a-spin>
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -173,9 +175,9 @@ export default {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'center', scopedSlots: { customRender: 'productCode' } },
-        { title: '产品名称', dataIndex: 'productName', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'origCode', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: '16%', align: 'left', scopedSlots: { customRender: 'productCode' } },
+        { title: '产品名称', dataIndex: 'productName', width: '24%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'origCode', width: '16%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '缺货数量', dataIndex: 'qty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '缺货金额', dataIndex: 'totalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -277,7 +279,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 255
+      this.tableHeight = window.innerHeight - tableSearchH - 225
     }
   },
   watch: {
@@ -314,3 +316,16 @@ export default {
   }
 }
 </script>
+<style lang="less">
+  .shortageStatisticsPList-wrap{
+     margin-bottom: 6px;
+     .sTable{
+       margin-top: 8px;
+     }
+     &:first-child{
+       .ant-card-body{
+         padding-bottom: 0;
+       }
+     }
+  }
+</style>

+ 162 - 101
src/views/salesManagement/stockPrint/list.vue

@@ -8,99 +8,115 @@
         </a-tab-pane>
       </a-tabs>
     </div>
-    <a-card style="margin-top: 5px;" size="small" :bordered="false">
-      <a-spin :spinning="spinning" tip="Loading...">
-        <!-- 搜索条件 -->
-        <div ref="tableSearch" class="table-page-search-wrapper">
-          <a-form layout="inline">
-            <a-row :gutter="15">
+      <!-- 搜索条件 -->
+    <a-card style="margin-top: 5px;" class="search-box" size="small" :bordered="false">
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline">
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="创建时间">
+                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+              </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="dealerSubareaScopeList" id="stockPrint-buyerName" @change="custChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="销售单号">
+                <a-input id="stockPrint-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+              </a-form-item>
+            </a-col>
+            <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="创建时间">
-                  <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+                <a-form-item label="备货单号">
+                  <a-input id="stockPrint-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="dealerSubareaScopeList" id="stockPrint-buyerName" @change="custChange" />
+                <a-form-item label="收货客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                  <dealerSubareaScopeList ref="shbuyerName" id="stockPrint-shbuyerName" @change="shcustChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="销售单号">
-                  <a-input id="stockPrint-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+                <a-form-item label="业务状态">
+                  <v-select
+                    v-model="queryParam.billStatus"
+                    ref="billStatus"
+                    id="stockPrint-billStatus"
+                    code="DISPATCH_BILL_STATUS"
+                    placeholder="请选择业务状态"
+                    allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="备货单号">
-                  <a-input id="stockPrint-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+              <a-col :md="6" :sm="24" v-if="currentTab == 1">
+                <a-form-item label="单据状态">
+                  <v-select
+                    v-model="queryParam.voidFlag"
+                    ref="voidFlag"
+                    id="pushOrder-voidFlag"
+                    code="VOID_FLAG"
+                    placeholder="请选择单据状态"
+                    allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <template v-if="advanced">
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="收货客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                    <dealerSubareaScopeList ref="shbuyerName" id="stockPrint-shbuyerName" @change="shcustChange" />
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="业务状态">
-                    <v-select
-                      v-model="queryParam.billStatus"
-                      ref="billStatus"
-                      id="stockPrint-billStatus"
-                      code="DISPATCH_BILL_STATUS"
-                      placeholder="请选择业务状态"
-                      allowClear></v-select>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24" v-if="currentTab == 1">
-                  <a-form-item label="单据状态">
-                    <v-select
-                      v-model="queryParam.voidFlag"
-                      ref="voidFlag"
-                      id="pushOrder-voidFlag"
-                      code="VOID_FLAG"
-                      placeholder="请选择单据状态"
-                      allowClear></v-select>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24" v-if="currentTab == 1">
-                  <a-form-item label="备货打印状态">
-                    <v-select
-                      v-model="queryParam.printStatus"
-                      ref="printStatus"
-                      id="pushOrder-printStatus"
-                      code="PRINT_STATUS"
-                      placeholder="请选择备货打印状态"
-                      allowClear></v-select>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-model-item label="所在区域">
-                    <subarea id="stockPrint-subarea" ref="subarea" @change="subareaChange"></subarea>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
-                    <Area id="stockPrint-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>
-              </template>
-              <a-col :md="5" :sm="24">
-                <span class="table-page-search-submitButtons">
-                  <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
-                  <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
-                  <a @click="advanced=!advanced" style="margin-left: 8px">
-                    {{ advanced ? '收起' : '展开' }}
-                    <a-icon :type="advanced ? 'up' : 'down'"/>
-                  </a>
-                </span>
+              <a-col :md="6" :sm="24" v-if="currentTab == 1">
+                <a-form-item label="备货打印状态">
+                  <v-select
+                    v-model="queryParam.printStatus"
+                    ref="printStatus"
+                    id="pushOrder-printStatus"
+                    code="PRINT_STATUS"
+                    placeholder="请选择备货打印状态"
+                    allowClear></v-select>
+                </a-form-item>
               </a-col>
-            </a-row>
-          </a-form>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="所在区域">
+                  <subarea id="stockPrint-subarea" ref="subarea" @change="subareaChange"></subarea>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
+                  <Area id="stockPrint-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>
+            </template>
+            <a-col :md="5" :sm="24">
+              <span class="table-page-search-submitButtons">
+                <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+                <a @click="advanced=!advanced" style="margin-left: 8px">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'"/>
+                </a>
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+    <a-card style="margin-top: 5px;" size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <div style="display:flex;align-items:center;justify-content: flex-end;">
+          <span>显示:</span>
+          <a-tree-select
+              size="small"
+              v-model="showCols"
+              style="min-width: 200px"
+              dropdownMatchSelectWidth
+              :maxTagCount="3"
+              :tree-data="colsArr"
+              tree-checkable
+              :show-checked-strategy="SHOW_PARENT"
+              placeholder="请选择要显示的列"
+            />
         </div>
         <!-- 列表 -->
         <s-table
@@ -111,7 +127,7 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :scroll="{ y:tableHeight, x: 1380 }"
+          :scroll="{ y:tableHeight }"
           :defaultLoadData="false"
           bordered>
           <!-- 销售单号 -->
@@ -264,41 +280,81 @@ export default {
       },
       tipData: null,
       showPrintModal: false,
-      showInfoModal: false
+      showInfoModal: false,
+      showCols:[],
+      colsArr:[
+        {
+          title: '仓库',
+          value: 'warehouseName',
+          key: 'warehouseName'
+        },
+        {
+          title: '业务状态',
+          value: 'billStatusDictValue',
+          key: 'billStatusDictValue'
+        },
+        {
+          title: '单据状态',
+          value: 'voidFlagDictValue',
+          key: 'voidFlagDictValue'
+        },
+        {
+          title: '允许打印时间',
+          value: 'allowPrintTime',
+          key: 'allowPrintTime'
+        },
+        {
+          title: '打印次数',
+          value: 'stockUpPrintTimes',
+          key: 'stockUpPrintTimes'
+        }
+      ]
     }
   },
   computed: {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '40px', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '100px', align: 'center' },
-        { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '110px', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '70px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '90px', align: 'center' },
+        { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '90px', align: 'center' },
         { title: '发货编号', dataIndex: 'sendNo', width: '40px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '80px', align: 'center', ellipsis: true },
+        { title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '50px', align: 'center', ellipsis: true },
         { title: '客户名称', dataIndex: 'buyerName', width: '100px', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '收货客户名称', dataIndex: 'receiverName', width: '100px', align: 'left', customRender: function (text) { return text || '--' } },
-        { title: '产品款数', dataIndex: 'totalCategory', width: '60px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '产品数量', dataIndex: 'totalQty', width: '60px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '仓库', dataIndex: 'warehouseName', width: '60px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '50px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据状态', dataIndex: 'voidFlagDictValue', width: '50px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '备货打印状态', width: '60px', align: 'center', scopedSlots: { customRender: 'printStatus' } },
-        { title: '允许打印时间', dataIndex: 'allowPrintTime', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '打印次数', dataIndex: 'stockUpPrintTimes', width: '40px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '60px', align: 'center',fixed:'right'}
+        { title: '产品款数', dataIndex: 'totalCategory', width: '50px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '产品数量', dataIndex: 'totalQty', width: '50px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
 
       if (this.$hasPermissions('M_stockPrintList_salesPrice')) { //  售价权限
         const ind = this.isShowWarehouse ? 10 : 9
         arr.splice(ind, 0, { title: '开单总金额', dataIndex: 'totalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(ind + 1, 0, { title: '正价总金额', dataIndex: 'normalTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-		    arr.splice(ind + 2, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '70px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+		    arr.splice(ind + 2, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(ind + 3, 0, { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(ind + 4, 0, { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(ind + 5, 0, { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(ind + 6, 0, { title: '轮胎售价', dataIndex: 'receiveLtTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(ind + 4, 0, { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '50px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(ind + 5, 0, { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '50px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(ind + 6, 0, { title: '轮胎售价', dataIndex: 'receiveLtTotalAmount', width: '50px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+      }
+      
+      if(this.showCols.includes('warehouseName')){
+        arr.push({ title: '仓库', dataIndex: 'warehouseName', width: '60px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
+        }
+      if(this.showCols.includes('billStatusDictValue')){
+        arr.push({ title: '业务状态', dataIndex: 'billStatusDictValue', width: '50px', align: 'center', customRender: function (text) { return text || '--' } })
+      }
+      if(this.showCols.includes('voidFlagDictValue')){
+        arr.push({ title: '单据状态', dataIndex: 'voidFlagDictValue', width: '50px', align: 'center', customRender: function (text) { return text || '--' } })
       }
+      arr.push({ title: '备货打印状态', width: '50px', align: 'center', scopedSlots: { customRender: 'printStatus' } })
+      if(this.showCols.includes('allowPrintTime')){
+        arr.push({ title: '允许打印时间', dataIndex: 'allowPrintTime', width: '70px', align: 'center', customRender: function (text) { return text || '--' } })
+      }
+      if(this.showCols.includes('stockUpPrintTimes')){
+        arr.push({ title: '打印次数', dataIndex: 'stockUpPrintTimes', width: '40px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+      }
+      
+      arr.push({ title: '操作', scopedSlots: { customRender: 'action' }, width: '60px', align: 'center'})
       return arr
     }
   },
@@ -440,7 +496,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 253
+      this.tableHeight = window.innerHeight - tableSearchH - 295
     }
   },
   watch: {
@@ -485,5 +541,10 @@ export default {
     .ant-tabs-bar{
       margin:0;
     }
+    .search-box{
+      .ant-card-body{
+        padding-bottom: 0;
+      }
+    }
   }
 </style>

+ 1 - 1
src/views/salesReturnManagement/billOfLading/add.vue

@@ -484,7 +484,7 @@ export default {
       height: 100%;
     }
     .billOfLadingEdit-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .affix{
       .ant-affix{

+ 26 - 26
src/views/salesReturnManagement/billOfLading/detail.vue

@@ -40,85 +40,85 @@
         :wrapper-col="formItemLayout.wrapperCol">
         <a-card :bordered="false" class="billOfLadingDetail-cont" v-if="form">
           <a-row>
-            <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+            <a-col :span="8">
               <a-form-model-item style="margin-bottom:0" label="提货单号">
                 {{ form.pickUpNo||'--' }}
               </a-form-model-item>
             </a-col>
-            <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+            <a-col :span="8">
               <a-form-model-item style="margin-bottom:0" label="创建时间">
                 {{ form.createDate||'--' }}
               </a-form-model-item>
             </a-col>
-            <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+            <a-col :span="8">
               <a-form-model-item style="margin-bottom:0" label="审核时间">
                 {{ form.auditDate||'--' }}
               </a-form-model-item>
             </a-col>
-            <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+            <a-col :span="8">
               <a-form-model-item style="margin-bottom:0" label="状态">
                 {{ form.stateDictValue||'--' }}
               </a-form-model-item>
             </a-col>
-            <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+            <a-col :span="8">
               <a-form-model-item style="margin-bottom:0" label="申请人">
                 {{ form.applyPersonName||'--' }}
               </a-form-model-item>
             </a-col>
-            <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+            <a-col :span="8">
               <a-form-model-item style="margin-bottom:0" label="主题">
                 {{ form.theme||'--' }}
               </a-form-model-item>
             </a-col>
-            <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+            <a-col :span="8">
               <a-form-model-item style="margin-bottom:0" label="物流公司">
                 {{ form.logisticsCompany||'--' }}
               </a-form-model-item>
             </a-col>
-            <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+            <a-col :span="8">
               <a-form-model-item style="margin-bottom:0" label="物流点">
-                {{ form.logisticsPoint }}
+                {{ form.logisticsPoint||'--' }}
               </a-form-model-item>
             </a-col>
-            <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+            <a-col :span="8">
               <a-form-model-item style="margin-bottom:0" label="发货方">
                 {{ form.dealerEntity&&form.dealerEntity.dealerName||'--' }}
               </a-form-model-item>
             </a-col>
-            <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+            <a-col :span="8">
               <a-form-model-item style="margin-bottom:0" label="收货人">
                 {{ form.receiverName||'--' }}
               </a-form-model-item>
             </a-col>
-            <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+            <a-col :span="8">
               <a-form-model-item style="margin-bottom:0" label="电话">
                 {{ form.receiverPhone||'--' }}
               </a-form-model-item>
             </a-col>
-            <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+            <a-col :span="8">
               <a-form-model-item style="margin-bottom:0" label="件数">
                 {{ form.goodsNum||'--' }} 件
               </a-form-model-item>
             </a-col>
-            <a-col :span="24">
-              <a-form-model-item style="margin-bottom:0" label="运费" :label-col="{span:2}" :wrapper-col="{span:20}">
+            <a-col :span="8">
+              <a-form-model-item style="margin-bottom:0" label="运费">
                 {{ form.freight||'--' }}
               </a-form-model-item>
             </a-col>
+            <a-col :span="8">
+              <a-form-model-item style="margin-bottom:0" label="退货仓库" prop="warehouseName">
+                {{ form.warehouseName||'--' }}
+              </a-form-model-item>
+            </a-col>
           </a-row>
           <a-row>
-            <a-col :spna="24">
-              <a-form-model-item style="margin-bottom:0" label="备注" prop="size" :label-col="{span:2}" :wrapper-col="{span:20}">
+            <a-col :span="16">
+              <a-form-model-item style="margin-bottom:0" label="备注" prop="size" :label-col="{span:2}" :wrapper-col="{span:22}">
                 <div style="word-break: break-all;line-height:normal;padding-top:10px;">{{ form.remarks||'--' }}</div>
               </a-form-model-item>
             </a-col>
-            <a-col :spna="24">
-              <a-form-model-item style="margin-bottom:0" label="退货仓库" prop="warehouseName" :label-col="{span:2}" :wrapper-col="{span:20}">
-                {{ form.warehouseName||'--' }}
-              </a-form-model-item>
-            </a-col>
-            <a-col :spna="24">
-              <a-form-model-item style="margin-bottom:10px" label="附件" :label-col="{span:2}" :wrapper-col="{span:20}">
+            <a-col :span="16">
+              <a-form-model-item style="margin-bottom:10px" label="附件" :label-col="{span:2}" :wrapper-col="{span:22}">
                 <div style="line-height:26px;">
                   <div v-for="item in form.attachmentList" :key="item.id">
                     <a :href="item.filePath">{{ item.fileName }}</a>
@@ -126,7 +126,7 @@
                 </div>
               </a-form-model-item>
             </a-col>
-            <a-col :spna="24">
+            <a-col :span="24">
               <a-form-model-item label="关联销退单" :label-col="{span:2}" :wrapper-col="{span:20}">
                 <a-table :columns="columns" :scroll="{ y: 400 }" :pagination="false" :data-source="chooseData" bordered>
                   <!-- 编号 -->
@@ -140,7 +140,7 @@
                 </a-table>
               </a-form-model-item>
             </a-col>
-            <a-col :spna="24" v-if="$hasPermissions('B_auditPickUp')&&form.state != 'WAIT_SUBMIT'">
+            <a-col :span="24" v-if="$hasPermissions('B_auditPickUp')&&form.state != 'WAIT_SUBMIT'">
               <a-form-model-item label="审核进度" :label-col="{span:2}" :wrapper-col="{span:20}">
                 <div>以下信息来自钉钉</div>
                 <s-table

+ 74 - 63
src/views/salesReturnManagement/billOfLading/list.vue

@@ -1,80 +1,83 @@
 <template>
+  <div>
   <a-card size="small" :bordered="false" class="billOfLading-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="创建时间">
+              <rangeDate ref="rangeCreateDate" :value="createDate" @change="dateCreateChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="提货单号">
+              <a-input id="billOfLading-pickUpNo" v-model.trim="queryParam.pickUpNo" allowClear placeholder="请输入提货单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="总部销退单号">
+              <a-input id="billOfLading-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
+            </a-form-item>
+          </a-col>
+    
+          <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-item label="创建时间">
-                <rangeDate ref="rangeCreateDate" :value="createDate" @change="dateCreateChange" />
+              <a-form-item label="申请人">
+                <employee style="width: 100%;" id="billOfLading-Employee" v-model="queryParam.applyPersonSn"></employee>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="提货单号">
-                <a-input id="billOfLading-pickUpNo" v-model.trim="queryParam.pickUpNo" allowClear placeholder="请输入提货单号"/>
+              <a-form-item label="物流点">
+                <a-input id="billOfLading-logisticsPoint" v-model.trim="queryParam.logisticsPoint" allowClear placeholder="请输入物流点"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="总部销退单号">
-                <a-input id="billOfLading-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
+              <a-form-item label="发货方">
+                <custList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" id="billOfLading-senderSn" @change="custChange" />
               </a-form-item>
             </a-col>
-
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="申请人">
-                  <employee style="width: 100%;" id="billOfLading-Employee" v-model="queryParam.applyPersonSn"></employee>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="物流点">
-                  <a-input id="billOfLading-logisticsPoint" v-model.trim="queryParam.logisticsPoint" allowClear placeholder="请输入物流点"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="发货方">
-                  <custList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" id="billOfLading-senderSn" @change="custChange" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="审核时间">
-                  <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="状态">
-                  <v-select
-                    v-model="queryParam.state"
-                    ref="state"
-                    id="billOfLading-state"
-                    code="PICK_UP_STATE"
-                    placeholder="请选择状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="退货仓库">
-                  <warehouse ref="warehouse" v-model="queryParam.warehouseSn"></warehouse>
-                </a-form-model-item>
-              </a-col>
-            </template>
             <a-col :md="6" :sm="24">
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
-                <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 8px">
-                  {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
-              </span>
+              <a-form-item label="审核时间">
+                <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
+              </a-form-item>
             </a-col>
-          </a-row>
-        </a-form>
-      </div>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="状态">
+                <v-select
+                  v-model="queryParam.state"
+                  ref="state"
+                  id="billOfLading-state"
+                  code="PICK_UP_STATE"
+                  placeholder="请选择状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="退货仓库">
+                <warehouse ref="warehouse" v-model="queryParam.warehouseSn"></warehouse>
+              </a-form-model-item>
+            </a-col>
+          </template>
+          <a-col :md="6" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 8px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
+  <a-card size="small" :bordered="false" class="billOfLading-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button type="primary" class="button-error" v-if="$hasPermissions('B_newPickUp')" @click="handleAdd">新增</a-button>
+        <a-button type="primary" v-if="$hasPermissions('B_newPickUp')" @click="handleAdd">新增</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -85,6 +88,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
+        :pageSize="30"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         bordered>
@@ -138,6 +142,7 @@
     <!-- 审核进度 -->
     <verifyModal :openModal="visibleAudit" :itemSn="auditInfo&&auditInfo.pickUpSn" @close="visibleAudit=false"></verifyModal>
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -329,7 +334,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 220
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   watch: {
@@ -371,6 +376,12 @@ export default {
 </script>
 <style lang="less">
   .billOfLading-wrap{
+    margin-bottom: 6px;
+    &:first-child{
+      .ant-card-body{
+        padding-bottom: 0;
+      }
+    }
     .sTable{
       .badge-con-t{
         .ant-badge-count{

+ 86 - 73
src/views/salesReturnManagement/pickUp/list.vue

@@ -1,80 +1,84 @@
 <template>
+  <div>
   <a-card size="small" :bordered="false" class="pickUp-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="审核时间">
+              <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="提货单号">
+              <a-input id="pickUp-pickUpNo" v-model.trim="queryParam.pickUpNo" allowClear placeholder="请输入提货单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="关联销退单号">
+              <a-input id="pickUp-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="申请人">
+              <employee style="width: 100%;" id="pickUp-Employee" v-model="queryParam.applyPersonSn"></employee>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-item label="审核时间">
-                <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
+              <a-form-item label="物流点">
+                <logisticsPoint style="width: 100%;" id="pickUp-logisticsPoint" v-model="queryParam.logisticsPoint"></logisticsPoint>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="提货单号">
-                <a-input id="pickUp-pickUpNo" v-model.trim="queryParam.pickUpNo" allowClear placeholder="请输入提货单号"/>
+              <a-form-item label="发货方">
+                <custList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" id="pickUp-senderSn" @change="custChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="关联销退单号">
-                <a-input id="pickUp-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
+              <a-form-item label="状态">
+                <v-select
+                  v-model="queryParam.state"
+                  ref="state"
+                  id="pickUp-state"
+                  code="PICK_UP_STATE"
+                  :notIn="['WAIT_SUBMIT','WAIT_AUDIT','AUDIT_REJECT']"
+                  placeholder="请选择状态"
+                ></v-select>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="申请人">
-                  <employee style="width: 100%;" id="pickUp-Employee" v-model="queryParam.applyPersonSn"></employee>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="物流点">
-                  <logisticsPoint style="width: 100%;" id="pickUp-logisticsPoint" v-model="queryParam.logisticsPoint"></logisticsPoint>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="发货方">
-                  <custList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" id="pickUp-senderSn" @change="custChange" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="状态">
-                  <v-select
-                    v-model="queryParam.state"
-                    ref="state"
-                    id="pickUp-state"
-                    code="PICK_UP_STATE"
-                    :notIn="['WAIT_SUBMIT','WAIT_AUDIT','AUDIT_REJECT']"
-                    placeholder="请选择状态"
-                  ></v-select>
-                </a-form-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>
-            </template>
-            <a-col :md="6" :sm="24">
-              <div class="table-page-search-submitButtons">
-                <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
-                <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 8px">
-                  {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
-              </div>
+            <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-row>
-        </a-form>
-      </div>
+          </template>
+          <a-col :md="24" :sm="24" style="text-align: center;">
+            <div class="table-page-search-submitButtons">
+              <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 8px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
+  <a-card size="small" :bordered="false" class="pickUp-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+64.5+'px' }"
+        :style="{ height: tableHeight+70+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
+        :pageSize="30"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
@@ -93,24 +97,27 @@
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-info"
-            v-if="(record.state == 'AUDIT_PASS'||record.state == 'FINISH')&&$hasPermissions('M_detailPickUp')"
-            @click="handleDetail(record)"
-            id="pickUp-detail-btn">详情</a-button>
-          <a-button
-            size="small"
-            type="link"
-            class="button-error"
-            v-if="record.state == 'AUDIT_PASS'&&$hasPermissions('B_pickUp')"
-            @click="handlePickUp(record)"
-            id="pickUp-detail-btn">提货</a-button>
+         <div>
+           <!-- <a-button
+             size="small"
+             type="link"
+             class="button-info"
+             v-if="(record.state == 'AUDIT_PASS'||record.state == 'FINISH')&&$hasPermissions('M_detailPickUp')"
+             @click="handleDetail(record)"
+             id="pickUp-detail-btn">详情</a-button> -->
+           <a-button
+             size="small"
+             type="link"
+             class="button-info"
+             v-if="record.state == 'AUDIT_PASS'&&$hasPermissions('B_pickUp')"
+             @click="handlePickUp(record)"
+             id="pickUp-detail-btn">提货</a-button>
+         </div>
         </template>
       </s-table>
     </a-spin>
   </a-card>
+ </div>
 </template>
 
 <script>
@@ -257,7 +264,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 180
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {
@@ -296,6 +303,12 @@ export default {
 </script>
 <style lang="less">
   .pickUp-wrap{
+    margin-bottom: 6px;
+    &:first-child{
+      .ant-card-body{
+        padding-bottom: 0;
+      }
+    }
     .sTable{
       .badge-con-t{
         .ant-badge-count{

+ 32 - 30
src/views/salesReturnManagement/salesReturn/detail.vue

@@ -3,10 +3,12 @@
     <a-spin :spinning="spinning" tip="Loading...">
       <a-page-header :ghost="false" :backIcon="false" class="salesReturnDetail-cont">
         <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.salesReturnBillNo }}</span>
+          <span style="margin: 0 10px;color: #666;">客户名称:{{ detailData&&detailData.buyerName }}</span>
+          <a-button size="small" type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
@@ -29,7 +31,7 @@
           <a-divider type="vertical" />
           <a-button
             key="1"
-            type="primary"
+            type="default"
             class="button-warning"
             id="salesReturnEdit-export-btn"
             v-if="$hasPermissions('B_salesReturnExport')"
@@ -38,30 +40,26 @@
         </template>
       </a-page-header>
       <!-- 基础信息 -->
-      <a-card size="small" :bordered="false" class="salesReturnDetail-cont">
-        <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions size="small" :column="4">
-              <a-descriptions-item label="单据来源">{{ detailData&&detailData.salesReturnBillSourceDictValue || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="销售退货单号">{{ detailData&&detailData.salesReturnBillNo || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="退货仓库">{{ detailData&&detailData.warehouseName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="客户采退申请单号">{{ detailData&&detailData.purchaseReturnApplyNo || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="是否同步给客户">{{ detailData&&detailData.syncFlag ? ['否', '是'][detailData.syncFlag] : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="退货类别">{{ detailData&&detailData.goodFlagDictValue || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="退货类型">{{ detailData&&detailData.salesReturnTypeDictValue || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="审核时间">{{ detailData&&detailData.auditTime || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="附件" v-if="detailData" :span="3">
-                <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailData.attachmentList" :key="item.id">
-                  {{ item.fileName }}
-                </a>
-                <span v-if="detailData.attachmentList.length==0">--</span>
-              </a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+      <a-card size="small" :bordered="false" class="salesReturnDetail-cont" v-show="showDetail">
+        <a-descriptions size="small" :column="4">
+          <a-descriptions-item label="单据来源">{{ detailData&&detailData.salesReturnBillSourceDictValue || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="销售退货单号">{{ detailData&&detailData.salesReturnBillNo || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="退货仓库">{{ detailData&&detailData.warehouseName || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="客户采退申请单号">{{ detailData&&detailData.purchaseReturnApplyNo || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="是否同步给客户">{{ detailData&&detailData.syncFlag ? ['否', '是'][detailData.syncFlag] : '--' }}</a-descriptions-item>
+          <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="退货类别">{{ detailData&&detailData.goodFlagDictValue || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="退货类型">{{ detailData&&detailData.salesReturnTypeDictValue || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="审核时间">{{ detailData&&detailData.auditTime || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="附件" v-if="detailData" :span="3">
+            <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailData.attachmentList" :key="item.id">
+              {{ item.fileName }}
+            </a>
+            <span v-if="detailData.attachmentList.length==0">--</span>
+          </a-descriptions-item>
+        </a-descriptions>
       </a-card>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <a-tabs v-model="curTab" @change="changeTab">
@@ -164,6 +162,7 @@ export default {
       nowType: '',
       visibleAudit: false,
       spinningAudit: false,
+      showDetail: false,
       curTab: 1,
       queryStrList: [
         { code: 0, text: '不显示退货单价/金额' },
@@ -312,7 +311,10 @@ export default {
 <style lang="less">
 .salesReturnDetail-wrap {
   .salesReturnDetail-cont {
-    margin-bottom: 10px;
+    margin-bottom: 8px;
+  }
+  .pages-wrap{
+    height: calc(100vh - 145px)
   }
   .footer-cont{
     margin-top: 5px;

+ 128 - 114
src/views/salesReturnManagement/salesReturn/list.vue

@@ -1,141 +1,148 @@
 <template>
+  <div>
   <a-card size="small" :bordered="false" class="salesReturn-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="创建时间">
+              <rangeDate ref="rangeCreateDate" :value="createDate" @change="dateCreateChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="审核时间">
+              <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
+            </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="dealerSubareaScopeList" id="salesReturn-buyerSn" @change="custChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="退货类别" prop="goodFlag">
+              <v-select
+                v-model="queryParam.goodFlag"
+                ref="goodFlag"
+                id="returnSchedule-goodFlag"
+                code="GOOD_FLAG"
+                placeholder="请选择退货类别"
+                allowClear></v-select>
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="退货类型">
+              <v-select
+                v-model="queryParam.salesReturnType"
+                id="departUser-salesReturnType"
+                code="SALES_RETURN_TYPE"
+                placeholder="请选择退货类型"
+                allowClear></v-select>
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="总部销退单号">
+              <a-input id="salesReturn-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-item label="创建时间">
-                <rangeDate ref="rangeCreateDate" :value="createDate" @change="dateCreateChange" />
+              <a-form-item label="客户采退申请单号">
+                <a-input id="salesReturn-purchaseReturnApplyNo" v-model.trim="queryParam.purchaseReturnApplyNo" allowClear placeholder="请输入客户采退申请单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="审核时间">
-                <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
+              <a-form-item label="单据来源">
+                <v-select
+                  v-model="queryParam.salesReturnBillSource"
+                  ref="salesReturnBillSource"
+                  id="salesReturn-salesReturnBillSource"
+                  code="SALES_SOURCE"
+                  placeholder="请选择单据来源"
+                  allowClear></v-select>
               </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="dealerSubareaScopeList" id="salesReturn-buyerSn" @change="custChange" />
+              <a-form-item label="是否同步给客户">
+                <v-select
+                  v-model="queryParam.syncFlag"
+                  ref="syncFlag"
+                  id="salesReturn-syncFlag"
+                  code="FLAG"
+                  placeholder="请选择是否同步给客户"
+                  allowClear></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="退货类别" prop="goodFlag">
+              <a-form-item label="业务状态">
                 <v-select
-                  v-model="queryParam.goodFlag"
-                  ref="goodFlag"
-                  id="returnSchedule-goodFlag"
-                  code="GOOD_FLAG"
-                  placeholder="请选择退货类别"
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  id="salesReturn-billStatus"
+                  code="SALES_RETURN_BILL_STATUS"
+                  placeholder="请选择业务状态"
                   allowClear></v-select>
-              </a-form-model-item>
+              </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="退货类型">
-                <v-select
-                  v-model="queryParam.salesReturnType"
-                  id="departUser-salesReturnType"
-                  code="SALES_RETURN_TYPE"
-                  placeholder="请选择退货类型"
-                  allowClear></v-select>
+              <a-form-model-item label="所在区域">
+                <subarea id="salesReturn-subarea" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="总部销退单号">
-                <a-input id="salesReturn-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
-              </a-form-item>
+              <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
+                <Area id="salesReturn-provinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
+              </a-form-model-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="客户采退申请单号">
-                  <a-input id="salesReturn-purchaseReturnApplyNo" v-model.trim="queryParam.purchaseReturnApplyNo" allowClear placeholder="请输入客户采退申请单号"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="单据来源">
-                  <v-select
-                    v-model="queryParam.salesReturnBillSource"
-                    ref="salesReturnBillSource"
-                    id="salesReturn-salesReturnBillSource"
-                    code="SALES_SOURCE"
-                    placeholder="请选择单据来源"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="是否同步给客户">
-                  <v-select
-                    v-model="queryParam.syncFlag"
-                    ref="syncFlag"
-                    id="salesReturn-syncFlag"
-                    code="FLAG"
-                    placeholder="请选择是否同步给客户"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="业务状态">
-                  <v-select
-                    v-model="queryParam.billStatus"
-                    ref="billStatus"
-                    id="salesReturn-billStatus"
-                    code="SALES_RETURN_BILL_STATUS"
-                    placeholder="请选择业务状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="所在区域">
-                  <subarea id="salesReturn-subarea" ref="subarea" @change="subareaChange"></subarea>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
-                  <Area id="salesReturn-provinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="退货仓库">
-                  <warehouse ref="warehouse" v-model="queryParam.warehouseSn"></warehouse>
-                </a-form-model-item>
-              </a-col>
-            </template>
             <a-col :md="6" :sm="24">
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
-                <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 8px">
-                  {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
-              </span>
+              <a-form-model-item label="退货仓库">
+                <warehouse ref="warehouse" v-model="queryParam.warehouseSn"></warehouse>
+              </a-form-model-item>
             </a-col>
-          </a-row>
-        </a-form>
-        <!-- 操作按钮 -->
-        <div class="table-operator">
-          <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesReturnNew')" @click="openModal = true">新增</a-button>
-        </div>
-        <a-alert type="info" style="margin-bottom:10px">
-          <div slot="message">
-            总单数:{{ countData&&countData.totalRecord||0 }};
-            申请退货数量:{{ countData&&countData.totalInitialQty||0 }};
-            仓库实收数量:{{ countData&&countData.totalReceiveQty||0 }};
-            坏件数量:{{ countData&&countData.totalBadQty||0 }};
-            良品数量:{{ countData&&countData.totalGoodQty||0 }};
-            返库数量:{{ countData&&countData.totalBackStockQty||0 }};
-            <span v-if="$hasPermissions('M_salesReturnList_salesPrice')">
-              实际退货金额:{{ countData&&countData.totalAmount?toThousands(countData.totalAmount):0 }};
+          </template>
+          <a-col :md="6" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 8px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
             </span>
-          </div>
-        </a-alert>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
+  
+  <a-card size="small" :bordered="false" class="salesReturn-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <div class="table-operator" style="flex-grow: 1;display: flex;justify-content: space-between;align-items: center;">
+       <div style="flex-grow: 1;display: flex;align-items: center;">
+         <!-- 操作按钮 -->
+         <div>
+           <a-button type="primary" v-if="$hasPermissions('B_salesReturnNew')" @click="openModal = true">新增</a-button>
+         </div>
+         <div class="tongji-bar">
+           总单数:{{ countData&&countData.totalRecord||0 }};
+           申请退货数量:{{ countData&&countData.totalInitialQty||0 }};
+           仓库实收数量:{{ countData&&countData.totalReceiveQty||0 }};
+           坏件数量:{{ countData&&countData.totalBadQty||0 }};
+           良品数量:{{ countData&&countData.totalGoodQty||0 }};
+           返库数量:{{ countData&&countData.totalBackStockQty||0 }};
+           <span v-if="$hasPermissions('M_salesReturnList_salesPrice')">
+             实际退货金额:{{ countData&&countData.totalAmount?toThousands(countData.totalAmount):0 }};
+           </span>
+         </div>
+       </div>
+       <div></div>
       </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+94.5+'px' }"
+        :style="{ height: tableHeight+85+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
@@ -227,6 +234,7 @@
     <!-- 选择审核人员 -->
     <chooseDepartUserModal v-drag :openModal="openDepartUserModal" @close="openDepartUserModal=false" @submit="handleSubmit"></chooseDepartUserModal>
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -329,11 +337,11 @@ export default {
         { title: '单据来源', dataIndex: 'salesReturnBillSourceDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '同步给客户', dataIndex: 'syncFlag', width: '5%', align: 'center', customRender: function (text) { return text ? ['否', '是'][text] : '--' } },
-        { title: '客户采退申请单号', dataIndex: 'purchaseReturnApplyNo', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户采退申请单号', dataIndex: 'purchaseReturnApplyNo', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '7%', align: 'center' },
         { title: '客户名称', dataIndex: 'buyerName', width: '7%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '退货类别', dataIndex: 'goodFlagDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货类型', dataIndex: 'salesReturnTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '退货类别', dataIndex: 'goodFlagDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '退货类型', dataIndex: 'salesReturnTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '申请退货数量', dataIndex: 'totalInitialQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓库实收数量', dataIndex: 'totalReceiveQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -512,7 +520,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 215
+      this.tableHeight = window.innerHeight - tableSearchH - 255
     }
   },
   watch: {
@@ -551,6 +559,12 @@ export default {
 </script>
 <style lang="less">
   .salesReturn-wrap{
+    margin-bottom: 6px;
+    &:first-child{
+      .ant-card-body{
+        padding-bottom: 0;
+      }
+    }
     .sTable{
       .badge-con-t{
         .ant-badge-count{

+ 3 - 5
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -5,16 +5,14 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="salesReturnEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName || '--' }}</span>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ ordeDetail&&ordeDetail.salesReturnBillNo }}</span>
+          <span style="margin: 0 10px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName || '--' }}</span>
           <span style="margin: 0 10px;color: #666;">
             退货仓库:{{ ordeDetail&&ordeDetail.warehouseName }}
           </span>
           <span style="margin: 0 10px;color: #666;">
             退货类别:{{ ordeDetail&&ordeDetail.goodFlagDictValue }}
           </span>
-          <span style="color: #666;">
-            总部销退单号:{{ ordeDetail&&ordeDetail.salesReturnBillNo }}
-          </span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
@@ -37,7 +35,7 @@
           <a-divider type="vertical" />
           <a-button
             key="1"
-            type="primary"
+            type="default"
             class="button-warning"
             id="salesReturnEdit-export-btn"
             v-if="$hasPermissions('B_salesReturnExport')"