lilei há 1 ano atrás
pai
commit
53e915a6ad

+ 1 - 3
src/components/global.less

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

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

@@ -160,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>

+ 5 - 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">

+ 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;

+ 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>

+ 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{

+ 1 - 1
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -37,7 +37,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')"