lilei преди 1 година
родител
ревизия
bb6e4e57d9

+ 13 - 13
src/views/allocationManagement/allocateReturnConfirmation/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="transferReturnConfirmation-wrap" style="margin-bottom:6px;">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper" >
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -58,9 +58,16 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 列表 -->
-        <s-table class="sTable fixPagination" ref="table" :style="{ height: tableHeight+84.5+'px' }" size="small"
-          :rowKey="(record) => record.id" :columns="columns" :data="loadData" :scroll="{ y: tableHeight }"
-          :defaultLoadData="false" bordered>
+        <s-table 
+        class="sTable fixPagination" 
+        ref="table" 
+        :style="{ height: tableHeight+70+'px' }" 
+        size="small"
+        :rowKey="(record) => record.id" 
+        :columns="columns" 
+        :pageSize="30"
+        :data="loadData" :scroll="{ y: tableHeight }"
+        :defaultLoadData="false" bordered>
           <!-- 销退单号 -->
           <template slot="allocateReturnNo" slot-scope="text, record">
             <span v-if="$hasPermissions('M_allocateReturnConfirmationDetail')" class="link-bule"
@@ -342,7 +349,7 @@
       },
       setTableH() {
         const tableSearchH = this.$refs.tableSearch.offsetHeight
-        this.tableHeight = window.innerHeight - tableSearchH - 226
+        this.tableHeight = window.innerHeight - tableSearchH - 200
       }
     },
     watch: {
@@ -382,13 +389,6 @@
 
 <style lang="less">
   .transferReturnConfirmation-wrap {
-    .active {
-      color: #ed1c24;
-      cursor: pointer;
-    }
-
-    .common {
-      color: rgba(0, 0, 0);
-    }
+     
   }
 </style>

+ 4 - 4
src/views/allocationManagement/allocationList/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="pushOrder-wrap" style="margin-bottom:6px;">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form-model
@@ -116,7 +116,7 @@
         <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"
@@ -285,7 +285,7 @@ export default {
         title: '调往对象',
         dataIndex: 'targetName',
         width: '150px',
-        align: 'center',
+        align: 'left',
         customRender: function (text) {
           return text || '--'
         },
@@ -622,7 +622,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 226
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {

+ 4 - 3
src/views/allocationManagement/matchSendOutOrder/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="allocateBillList-wrap" style="margin-bottom:6px;">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -79,11 +79,12 @@
         <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"
           :defaultLoadData="false"
           :scroll="{ y: tableHeight }"
           bordered>
@@ -277,7 +278,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 226
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {

+ 5 - 4
src/views/allocationManagement/transferOut/detail.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle" v-if="!outBizSn">
           <a id="allocateBillDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ basicInfoData&&basicInfoData.allocateNo }}</span>
           <a-button
             v-if="isEdit"
             type="link"
@@ -29,7 +30,7 @@
             @click="handlePrint('dbPrint')">调拨打印</a-button>
           <a-button
             key="3"
-            type="default"
+            type="primary"
             class="button-info"
             v-if="$hasPermissions('B_transferOutType_print')"
             id="allocateBillDetail-dbfl-print-btn"
@@ -38,7 +39,7 @@
           <a-divider type="vertical" />
           <a-button
             key="2"
-            type="primary"
+            type="default"
             class="button-info"
             v-if="$hasPermissions('B_transferOut_detail_export')"
             id="allocateBillDetail-export-btn"
@@ -309,10 +310,10 @@ export default {
 <style lang="less">
   .allocateBillDetail-wrap{
     .allocateBillDetail-back{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .allocateBillDetail-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
   }
 </style>

+ 9 - 17
src/views/allocationManagement/transferOut/edit.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="allocateBillEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ basicInfoData&&basicInfoData.allocateNo }}</span>
           <a-button type="link" class="button-default" @click="showDetail=!showDetail">
             <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
           </a-button>
@@ -46,8 +47,8 @@
             @click="handlePrint('dbflExport')">调拨分类导出</a-button>
         </template>
       </a-page-header>
-      <a-card size="small" :bordered="false" v-if="basicInfoData&&showDetail" class="allocateBillEdit-cont">
-        <div>
+      <a-card size="small" :bordered="false" v-show="showDetail" class="allocateBillEdit-cont">
+        <div v-if="basicInfoData">
           <a-descriptions :column="4">
             <a-descriptions-item label="调往对象">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="调出仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item>
@@ -103,9 +104,7 @@
         </div>
       </a-card>
       <!-- 选择产品 -->
-      <a-card size="small" :bordered="false" class="allocateBillEdit-cont">
-        <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" :forceRender="true" header="选择产品">
+      <a-card size="small" title="选择产品" :bordered="false" class="allocateBillEdit-cont">
             <!-- 筛选条件 -->
             <div class="table-page-search-wrapper">
               <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -168,13 +167,9 @@
                 >添加</a-button>
               </template>
             </s-table>
-          </a-collapse-panel>
-        </a-collapse>
       </a-card>
       <!-- 已选产品 -->
-      <a-card size="small" :bordered="false" class="allocateBillEdit-cont">
-        <a-collapse :activeKey="['2']">
-          <a-collapse-panel key="2" :forceRender="true" header="已选产品">
+      <a-card size="small" title="已选产品" :bordered="false" class="allocateBillEdit-cont">
             <!-- 总计 -->
             <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
@@ -210,12 +205,11 @@
               <a-col :span="8" style="text-align: right;">
                 <span v-if="selNums">已选{{ selNums }}项</span>
                 <a-button
-                  style="margin:0 15px;"
-                  size="small"
+                  style="margin:0 10px;"
                   id="salesEdit-plDel-btn"
                   @click="openPlSet">批量设置费用归属</a-button>
-                <a-button size="small" id="allocateBillEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
-                <a-button size="small" type="danger" style="margin-left: 5px" @click.stop="handleDel('', 'all')" id="chainTransferOutEdit-del-all-btn">整单删除</a-button>
+                <a-button id="allocateBillEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
+                <a-button type="danger" style="margin-left: 10px" @click.stop="handleDel('', 'all')" id="chainTransferOutEdit-del-all-btn">整单删除</a-button>
               </a-col>
             </a-row>
             <!-- 列表 -->
@@ -294,8 +288,6 @@
                   id="allocateBillEdit-del-btn">删除</a-button>
               </template>
             </s-table>
-          </a-collapse-panel>
-        </a-collapse>
       </a-card>
     </div>
     <div class="affix-cont" v-if="basicInfoData">
@@ -369,7 +361,7 @@ export default {
       showDsModal: false,
       editRemark: false,
       showPlModal: false,
-      showDetail: true, // 基础信息
+      showDetail: false, // 基础信息
       queryParam: {
         productCode: '',
         productName: '',

+ 4 - 4
src/views/allocationManagement/transferOut/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="allocateBillList-wrap">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -103,13 +103,13 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator">
-          <a-button v-if="$hasPermissions('B_transferOut_add')" id="allocateBillList-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
+          <a-button v-if="$hasPermissions('B_transferOut_add')" id="allocateBillList-add" type="primary" @click="openModal=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"
@@ -443,7 +443,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 266
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     },
     handlePrint (item) {
       const obj = {

+ 1 - 1
src/views/allocationManagement/transferReturn/check.vue

@@ -277,7 +277,7 @@ export default {
       height: 100%;
     }
     .salesReturnCheck-cont{
-      margin-top: 10px;
+      margin-top: 6px;
       .sTable{
         margin-top: 10px;
       }

+ 9 - 13
src/views/allocationManagement/transferReturn/edit.vue

@@ -6,6 +6,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="allocateBillEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ basicInfoData&&basicInfoData.allocateReturnNo }}</span>
           <a-button type="link" class="button-default" @click="showDetail=!showDetail">
             <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
           </a-button>
@@ -49,9 +50,7 @@
         </a-descriptions>
       </a-card>
       <!-- 选择产品 -->
-      <a-card size="small" :bordered="false" class="allocateBillEdit-cont">
-        <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" :forceRender="true" header="选择产品">
+      <a-card size="small" title="选择产品" :bordered="false" class="allocateBillEdit-cont">
             <!-- 筛选条件 -->
             <div class="table-page-search-wrapper">
               <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -125,13 +124,9 @@
                 <span v-else>--</span>
               </template>
             </s-table>
-          </a-collapse-panel>
-        </a-collapse>
       </a-card>
       <!-- 已选产品 -->
-      <a-card size="small" :bordered="false" class="allocateBillEdit-cont">
-        <a-collapse :activeKey="['2']">
-          <a-collapse-panel key="2" :forceRender="true" header="已选产品">
+      <a-card size="small" title="已选产品" :bordered="false" class="allocateBillEdit-cont">
             <!-- 总计 -->
             <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
@@ -210,8 +205,6 @@
                 <a-button size="small" type="link" class="button-error" @click="handleDel(record)" id="allocateBillEdit-del-btn">删除</a-button>
               </template>
             </s-table>
-          </a-collapse-panel>
-        </a-collapse>
       </a-card>
     <!-- </a-spin> -->
     </div>
@@ -334,7 +327,7 @@ export default {
       openModal: false,
       nowType: null,
       allocateTypeVal: [],
-      showDetail: true
+      showDetail: false
     }
   },
   computed: {
@@ -606,10 +599,13 @@ export default {
       padding-bottom: 51px;
     }
     .allocateBillEdit-back{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
+      .ant-page-header-heading-sub-title{
+        margin:0;
+      }
     }
     .allocateBillEdit-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
       .sub-title{
         font-size: 12px;
         color: #808695;

+ 45 - 47
src/views/allocationManagement/transferReturn/editGrp.vue

@@ -6,52 +6,52 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="editGrap-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ basicInfoData&&basicInfoData.allocateReturnNo }}</span>
+          <a-button type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
           <print :params="{allocateReturnSn: $route.params.sn}" :disabled="localDataSource.length==0" @loading="spinning=true" @unloading="spinning=false"></print>
         </template>
       </a-page-header>
-      <a-card size="small" :bordered="false" v-if="basicInfoData" class="editGrap-cont">
-        <a-collapse :activeKey="['0']">
-          <a-collapse-panel key="0" header="基础信息">
-            <a-descriptions :column="3">
-              <a-descriptions-item label="调拨退货单号">{{ (basicInfoData&&basicInfoData.allocateReturnNo) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="调拨退货对象">{{ (basicInfoData&&basicInfoData.targetTypeDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="调拨退货对象名称">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="调入仓库">
-                <!-- <warehouse
-                style="width:200px;"
-                :allowClear="false"
-                  v-model="basicInfoData.warehouseSn"
-                  @change="updateWarehouse"
-                  id="basicInfo-warehouseSn"
-                  placeholder="请选择调入仓库"
-                /> -->
-                {{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}
-              </a-descriptions-item>
-              <a-descriptions-item label="费用/调拨退货类型">
-                <AllocateType
-                  id="allocateEdit-allocateReturnTypeSn"
-                  style="width: 220px;"
-                  v-model="allocateTypeVal"
-                  placeholder="请选择费用/调拨退货类型"
-                  @change="changeAllocateType"></AllocateType>
-              </a-descriptions-item>
-              <a-descriptions-item label="是否抓单">{{ (basicInfoData&&basicInfoData.grabFlagDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="业务状态">{{ (basicInfoData&&basicInfoData.stateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="备注">
-                {{ (basicInfoData&&basicInfoData.remarks) }}
-                <a-icon type="form" title="编辑备注" @click="editRemark = true" style="color: dodgerblue;font-size: 14px;" />
-              </a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+      <a-card size="small" :bordered="false" v-show="showDetail" class="editGrap-cont">
+        <div v-if="basicInfoData">
+          <a-descriptions :column="3">
+            <a-descriptions-item label="调拨退货单号">{{ (basicInfoData&&basicInfoData.allocateReturnNo) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="调拨退货对象">{{ (basicInfoData&&basicInfoData.targetTypeDictValue) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="调拨退货对象名称">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="调入仓库">
+              <!-- <warehouse
+              style="width:200px;"
+              :allowClear="false"
+                v-model="basicInfoData.warehouseSn"
+                @change="updateWarehouse"
+                id="basicInfo-warehouseSn"
+                placeholder="请选择调入仓库"
+              /> -->
+              {{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}
+            </a-descriptions-item>
+            <a-descriptions-item label="费用/调拨退货类型">
+              <AllocateType
+                id="allocateEdit-allocateReturnTypeSn"
+                style="width: 220px;"
+                v-model="allocateTypeVal"
+                placeholder="请选择费用/调拨退货类型"
+                @change="changeAllocateType"></AllocateType>
+            </a-descriptions-item>
+            <a-descriptions-item label="是否抓单">{{ (basicInfoData&&basicInfoData.grabFlagDictValue) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="业务状态">{{ (basicInfoData&&basicInfoData.stateDictValue) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="备注">
+              {{ (basicInfoData&&basicInfoData.remarks) }}
+              <a-icon type="form" title="编辑备注" @click="editRemark = true" style="color: dodgerblue;font-size: 14px;" />
+            </a-descriptions-item>
+          </a-descriptions>
+        </div>
       </a-card>
       <!-- 选择产品 -->
-      <a-card size="small" :bordered="false" class="editGrap-cont">
-        <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" :forceRender="true" header="选择产品">
+      <a-card size="small" title="选择产品" :bordered="false" class="editGrap-cont">
             <!-- 筛选条件 -->
             <div class="table-page-search-wrapper" style="display:flex;align-items: center;">
               <div style="margin-bottom: 10px;padding-right: 20px;">
@@ -127,13 +127,9 @@
                 <span v-else>--</span>
               </template>
             </s-table>
-          </a-collapse-panel>
-        </a-collapse>
       </a-card>
       <!-- 已选产品 -->
-      <a-card size="small" :bordered="false" class="editGrap-cont">
-        <a-collapse :activeKey="['2']">
-          <a-collapse-panel key="2" :forceRender="true" header="已选产品">
+      <a-card size="small" title="已选产品" :bordered="false" class="editGrap-cont">
             <!-- 总计 -->
             <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
@@ -201,8 +197,6 @@
                 <a-button size="small" type="link" class="button-error" @click="handleDel(record)" id="editGrap-del-btn">删除</a-button>
               </template>
             </s-table>
-          </a-collapse-panel>
-        </a-collapse>
       </a-card>
     <!--</a-spin>-->
     </div>
@@ -269,6 +263,7 @@ export default {
   data () {
     return {
       spinning: false,
+      showDetail: false,
       queryParam: {
         productCode: '',
         productName: '',
@@ -655,10 +650,13 @@ export default {
       padding-bottom: 51px;
     }
     .editGrap-back{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
+      .ant-page-header-heading-sub-title{
+        margin:0;
+      }
     }
     .editGrap-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
       .sub-title{
         font-size: 12px;
         color: #808695;

+ 67 - 62
src/views/allocationManagement/transferReturn/list.vue

@@ -1,76 +1,80 @@
 <template>
-  <a-card size="small" :bordered="false" class="transferReturn-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>
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
+    <!-- 搜索条件 -->
+    <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="调拨退货单号">
+              <a-input id="transferReturn-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo" allowClear placeholder="请输入调拨退货单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="调拨退货对象名称">
+              <a-input id="transferReturn-targetName" v-model.trim="queryParam.targetName" 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="费用/调拨退货类型">
+                <AllocateType id="transferReturn-allocateReturnTypeSn" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨退货类型" @change="changeAllocatype"></AllocateType>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="调拨退货单号">
-                <a-input id="transferReturn-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo" allowClear placeholder="请输入调拨退货单号"/>
+              <a-form-item label="调入仓库">
+                <warehouse
+                  v-model="queryParam.warehouseSn"
+                  id="transferReturn-warehouseSn"
+                  placeholder="请选择调入仓库"
+                />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="调拨退货对象名称">
-                <a-input id="transferReturn-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调拨退货对象名称"/>
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.state"
+                  ref="state"
+                  id="transferReturn-state"
+                  code="ALLOCATE_RETURN_STATE"
+                  placeholder="请选择业务状态"
+                  allowClear
+                ></v-select>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="费用/调拨退货类型">
-                  <AllocateType id="transferReturn-allocateReturnTypeSn" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨退货类型" @change="changeAllocatype"></AllocateType>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="调入仓库">
-                  <warehouse
-                    v-model="queryParam.warehouseSn"
-                    id="transferReturn-warehouseSn"
-                    placeholder="请选择调入仓库"
-                  />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="业务状态">
-                  <v-select
-                    v-model="queryParam.state"
-                    ref="state"
-                    id="transferReturn-state"
-                    code="ALLOCATE_RETURN_STATE"
-                    placeholder="请选择业务状态"
-                    allowClear
-                  ></v-select>
-                </a-form-item>
-              </a-col>
-            </template>
-            <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="transferReturn-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="transferReturn-reset">重置</a-button>
-              <!-- <a-button
-                style="margin-left: 5px"
-                type="primary"
-                class="button-warning"
-                v-if="$hasPermissions('B_transferOut_export')"
-                @click="handleExport"
-                :disabled="disabled"
-                :loading="exportLoading"
-                id="transferReturn-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>
+          </template>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="transferReturn-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="transferReturn-reset">重置</a-button>
+            <!-- <a-button
+              style="margin-left: 5px"
+              type="primary"
+              class="button-warning"
+              v-if="$hasPermissions('B_transferOut_export')"
+              @click="handleExport"
+              :disabled="disabled"
+              :loading="exportLoading"
+              id="transferReturn-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="transferReturn-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button v-if="$hasPermissions('B_transferReturnNew')" id="transferReturn-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
+        <a-button v-if="$hasPermissions('B_transferReturnNew')" id="transferReturn-add" type="primary" @click="openModal=true">新增</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -143,6 +147,7 @@
       @ok="auditOrder('WAIT_CHECK')"
       @fail="auditOrder('AUDIT_REJECT')" />
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -330,7 +335,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 242
+      this.tableHeight = window.innerHeight - tableSearchH - 255
     }
   },
   watch: {

+ 3 - 2
src/views/allocationManagement/transferReturn/print.vue

@@ -2,7 +2,8 @@
   <div>
     <a-button
       key="1"
-      type="default"
+      type="primary"
+      class="button-info"
       v-if="$hasPermissions('B_transferReturnPrint')"
       id="editGrap-db-print-btn"
       :disabled="disabled"
@@ -18,7 +19,7 @@
     <a-divider type="vertical" />
     <a-button
       key="3"
-      type="primary"
+      type="default"
       class="button-warning"
       v-if="$hasPermissions('B_transferReturnExport')"
       id="editGrap-export-btn"

+ 9 - 9
src/views/allocationManagement/transfersPrint/list.vue

@@ -1,14 +1,6 @@
 <template>
   <div class="allocateBillList-wrap">
-    <div style="background-color: #fff;margin-bottom: 5px;">
-      <a-tabs v-model="currentTab" @change="changeTab">
-        <a-tab-pane :key="1" tab="全部">
-        </a-tab-pane>
-        <a-tab-pane :key="2" tab="待打印">
-        </a-tab-pane>
-      </a-tabs>
-    </div>
-    <a-card size="small" :bordered="false" style="margin-bottom: 6px;">
+    <a-card size="small" :bordered="false" :class="currentTab==2 ? 'searchBox' : 'searchBoxNormal'">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -103,6 +95,14 @@
         </a-form>
       </div>
     </a-card>
+    <div style="background-color: #fff;">
+      <a-tabs v-model="currentTab" @change="changeTab">
+        <a-tab-pane :key="1" tab="全部">
+        </a-tab-pane>
+        <a-tab-pane :key="2" tab="待打印">
+        </a-tab-pane>
+      </a-tabs>
+    </div>
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 列表 -->