فهرست منبع

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

chenrui 1 سال پیش
والد
کامیت
512a607213
22فایلهای تغییر یافته به همراه599 افزوده شده و 481 حذف شده
  1. 24 6
      src/components/global.less
  2. 22 20
      src/views/financialManagement/collectionDetailStatic/list.vue
  3. 1 1
      src/views/financialManagement/financialCollection/baseModal.vue
  4. 48 26
      src/views/financialManagement/financialCollection/detail.vue
  5. 14 8
      src/views/financialManagement/financialCollection/edit.vue
  6. 1 1
      src/views/financialManagement/financialCollection/fcDetailModal.vue
  7. 85 79
      src/views/financialManagement/financialCollection/list.vue
  8. 2 2
      src/views/financialManagement/warehousingConfirmation/detailModal.vue
  9. 42 37
      src/views/financialManagement/warehousingConfirmation/list.vue
  10. 1 1
      src/views/purchasingManagement/bulkWarehousingOrder/auditNoPassModal.vue
  11. 1 1
      src/views/purchasingManagement/bulkWarehousingOrder/basicInfoModal.vue
  12. 4 6
      src/views/purchasingManagement/bulkWarehousingOrder/detailModal.vue
  13. 78 58
      src/views/purchasingManagement/bulkWarehousingOrder/edit.vue
  14. 44 38
      src/views/purchasingManagement/bulkWarehousingOrder/list.vue
  15. 4 1
      src/views/purchasingManagement/bulkWarehousingOrder/productModal.vue
  16. 16 4
      src/views/purchasingManagement/purchaseReturn/list.vue
  17. 32 31
      src/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue
  18. 6 4
      src/views/purchasingManagement/purchaseReturn/queryPart.vue
  19. 69 58
      src/views/salesReturnManagement/receiveCheck/list.vue
  20. 1 1
      src/views/salesReturnManagement/returnConfirmation/detailModal.vue
  21. 87 82
      src/views/salesReturnManagement/returnConfirmation/list.vue
  22. 17 16
      src/views/salesReturnManagement/returnSchedule/list.vue

+ 24 - 6
src/components/global.less

@@ -553,7 +553,30 @@ body {
       margin-right: 5px;
     }
   }
-   
+  // 查询条件底部距离
+  .searchBottomSpace{
+    margin-bottom: 6px !important;
+  }
+  .searchBox{
+    margin-bottom: 6px;
+    &:first-child{
+      .ant-card-body{
+        padding: 10px 12px;
+      }
+    }
+  }
+  .searchBoxNormal{
+    margin-bottom: 6px;
+    &:first-child{
+      .ant-card-body{
+        padding: 10px 12px 0;
+      }
+    }
+  }
+  .flex-center{
+    display: flex;
+    align-items: center;
+  }
   // 统计样式白底黑子
   .tongji-bar{}
   // 底部按钮浮动栏
@@ -618,8 +641,3 @@ body {
     }
   }
 }
- 
-// 查询条件底部距离
-.searchBottomSpace{
-  margin-bottom: 6px !important;
-}

+ 22 - 20
src/views/financialManagement/collectionDetailStatic/list.vue

@@ -122,7 +122,7 @@
             </template>
             <a-col :md="24" :sm="24" style="text-align:center;">
               <a-button type="primary" @click="searchForm" :disabled="disabled" id="collectionDetail-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="collectionDetail-reset">重置</a-button>
+              <a-button style="margin-left: 10px" @click="resetSearchForm" :disabled="disabled" id="collectionDetail-reset">重置</a-button>
               <a-button
                 style="margin-left: 10px"
                 type="primary"
@@ -142,30 +142,32 @@
       </div>
     </a-card>
     <a-card size="small" :bordered="false" class="collectionDetail-wrap" style="margin-top:5px;">
-      <div class="gatherMessage">
-        订单总金额:<strong> {{ toThousands(countData&&countData.orderAmount||0) }}</strong>;
-        收款总金额:<strong>{{ toThousands(countData&&countData.receiptAmount||0) }}</strong>;
-        使用授信总金额:<strong>{{ toThousands(countData&&countData.useCreditAmount||0) }}</strong>;
-        授信还款总金额:<strong>{{ toThousands(countData&&countData.payCreditAmount||0) }}</strong>;
-        余款抵扣总金额:<strong>{{ toThousands(countData&&countData.balanceAmount||0) }}</strong>;
-        跨月打款总金额:<strong>{{ toThousands(countData&&countData.nextMonthAmount||0) }}</strong>;
-      </div>
-      <div class="gatherMessage">
-        <a-dropdown>
-          <a-menu slot="overlay" @click="handleMenuClick">
-            <a-menu-item key="1"> <a-icon type="printer" />批量允许打印 </a-menu-item>
-            <a-menu-item key="2"> <a-icon type="block" />批量设置开票 </a-menu-item>
-          </a-menu>
-          <a-button type="primary" ghost> 批量处理 <a-icon type="down" /></a-button>
-        </a-dropdown>
-        <span v-if="selNums" style="margin-left:10px;">已选{{ selNums }}项</span>
+      <div class="flex-center" style="margin-bottom: 10px;">
+        <div class="flex-center">
+          <a-dropdown>
+            <a-menu slot="overlay" @click="handleMenuClick">
+              <a-menu-item key="1"> <a-icon type="printer" />批量允许打印 </a-menu-item>
+              <a-menu-item key="2"> <a-icon type="block" />批量设置开票 </a-menu-item>
+            </a-menu>
+            <a-button type="primary" ghost> 批量处理 <a-icon type="down" /></a-button>
+          </a-dropdown>
+          <span v-if="selNums" style="margin-left:10px;">已选{{ selNums }}项</span>
+        </div>
+        <div class="flex-center" style="margin-left:10px;">
+          订单总金额:<strong> {{ toThousands(countData&&countData.orderAmount||0) }}</strong>;
+          收款总金额:<strong>{{ toThousands(countData&&countData.receiptAmount||0) }}</strong>;
+          使用授信总金额:<strong>{{ toThousands(countData&&countData.useCreditAmount||0) }}</strong>;
+          授信还款总金额:<strong>{{ toThousands(countData&&countData.payCreditAmount||0) }}</strong>;
+          余款抵扣总金额:<strong>{{ toThousands(countData&&countData.balanceAmount||0) }}</strong>;
+          跨月打款总金额:<strong>{{ toThousands(countData&&countData.nextMonthAmount||0) }}</strong>;
+        </div>
       </div>
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 列表 -->
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+60+'px' }"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
@@ -537,7 +539,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 310
+      this.tableHeight = window.innerHeight - tableSearchH - 250
     },
     // 开票操作
     handleInvoice (con) {

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

@@ -55,8 +55,8 @@
             upText="上传附件"></Upload>
         </a-form-model-item>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;margin-top: 50px;">
+          <a-button @click="cancel" style="margin-right: 15px" id="chooseCustom-btn-back">取消</a-button>
           <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
-          <a-button @click="cancel" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
         </a-form-model-item>
       </a-form-model>
     </a-spin>

+ 48 - 26
src/views/financialManagement/financialCollection/detail.vue

@@ -1,34 +1,37 @@
 <template>
-  <div class="financialCollectionAddwrap">
+  <div class="financialCollectionDetailwrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-page-header :ghost="false" :backIcon="false" class="financialCollectionAddcont" v-if="!bookSn" >
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="purchaseOrderEdit-back-btn" href="javascript:;" @click="handleBack(0)"><a-icon type="left" /> 返回列表</a>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.bookNo || '--' }}</span>
+          <span style="margin: 0 10px;color: #666;">申请人:{{ detailData&&detailData.applyPersonName }}</span>
+          <a-button type="link" size="small" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
       </a-page-header>
-      <a-collapse :activeKey="['1']" class="financialCollectionAddcont" v-if="detailData">
-        <a-collapse-panel key="1" header="基础信息">
-          <a-descriptions :column="{ xs: 2, sm: 3, md: 3}">
-            <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="收款单号">
-              {{ detailData&&detailData.bookNo || '--' }}
-            </a-descriptions-item>
-            <a-descriptions-item label="申请人">{{ detailData&&detailData.applyPersonName || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="审核时间">{{ detailData&&detailData.auditDate || '--' }}</a-descriptions-item>
-            <a-descriptions-item span="2" label="收款事由">{{ detailData&&detailData.bookReason || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="状态">{{ detailData&&detailData.statusDictValue || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="付款方类型">{{ detailData&&detailData.payerTypeDictValue || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="付款方">{{ detailData&&detailData.payerName || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="备注" :span="3">{{ detailData&&detailData.remarks||'--' }}</a-descriptions-item>
-            <a-descriptions-item label="附件" :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>
-            </a-descriptions-item>
-          </a-descriptions>
-        </a-collapse-panel>
-      </a-collapse>
+      <a-card :bordered="false" class="financialCollectionAddcont" v-show="showDetail">
+         <a-descriptions :column="{ xs: 2, sm: 3, md: 3}" v-if="detailData" ref="tableSearch">
+           <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="收款单号">
+             {{ detailData&&detailData.bookNo || '--' }}
+           </a-descriptions-item>
+           <a-descriptions-item label="申请人">{{ detailData&&detailData.applyPersonName || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="审核时间">{{ detailData&&detailData.auditDate || '--' }}</a-descriptions-item>
+           <a-descriptions-item span="2" label="收款事由">{{ detailData&&detailData.bookReason || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="状态">{{ detailData&&detailData.statusDictValue || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="付款方类型">{{ detailData&&detailData.payerTypeDictValue || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="付款方">{{ detailData&&detailData.payerName || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="备注" :span="3">{{ detailData&&detailData.remarks||'--' }}</a-descriptions-item>
+           <a-descriptions-item label="附件" :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>
+           </a-descriptions-item>
+         </a-descriptions>
+      </a-card>
       <!-- 财务明细 -->
       <a-card :bordered="false" size="small" class="financialCollectionAddcont" v-if="$route.params.sn||bookSn">
         <div slot="title">
@@ -51,9 +54,11 @@
           class="sTable fixPagination"
           ref="table"
           size="small"
+          :style="{ height: tableHeight+5+'px' }"
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           :showPagination="false"
           bordered>
@@ -99,8 +104,10 @@ export default {
       spinning: false,
       detailData: null,
       openDepartUserModal: false,
+      showDetail: false,
       total: 0,
       bookSn: null,
+      tableHeight: 300,
       loadData: parameter => {
         const params = Object.assign(parameter, { bookSn: this.$route.params.sn || this.bookSn })
         return financeBookDetailQueryList(params).then(res => {
@@ -149,7 +156,22 @@ export default {
       ]
     }
   },
+  watch: {
+    showDetail (newValue, oldValue) {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   methods: {
+    setTableH () {
+      const tableSearchH = this.showDetail ? this.$refs.tableSearch.offsetHeight : 0
+      this.tableHeight = window.innerHeight - tableSearchH - 240
+    },
     getTotal (data) {
       let ret = 0
       data.map(item => {
@@ -170,6 +192,7 @@ export default {
       })
       this.$nextTick(() => {
         this.$refs.table.refresh(true)
+        this.setTableH()
       })
     },
     // 返回
@@ -201,13 +224,12 @@ export default {
 </script>
 
 <style lang="less">
-  .financialCollectionAddwrap{
+  .financialCollectionDetailwrap{
     position: relative;
     height: 100%;
-    padding-bottom: 51px;
     box-sizing: border-box;
     .financialCollectionAddcont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .affix{
       .ant-affix{

+ 14 - 8
src/views/financialManagement/financialCollection/edit.vue

@@ -5,13 +5,15 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="purchaseOrderEdit-back-btn" href="javascript:;" @click="handleBack(0)"><a-icon type="left" /> 返回列表</a>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.bookNo || '--' }}</span>
+          <span style="margin: 0 10px;color: #666;">申请人:{{ detailData&&detailData.applyPersonName }}</span>
+          <a-button type="link" size="small" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
       </a-page-header>
-      <a-collapse :activeKey="['1']" class="financialCollectionAddcont" v-if="detailData">
-        <a-collapse-panel key="1" header="基础信息">
-          <div slot="extra" style="padding: 0 20px; color: #00aaff;" @click.stop="handleEditBase" >
-            <a-icon type="edit" /> 编辑基础信息
-          </div>
+      <a-card size="small" :bordered="false" class="financialCollectionAddcont" v-show="showDetail">
+        <div v-if="detailData">
           <a-descriptions :column="{ xs: 2, sm: 3, md: 3}">
             <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
             <a-descriptions-item label="收款单号">
@@ -30,8 +32,11 @@
               </a>
             </a-descriptions-item>
           </a-descriptions>
-        </a-collapse-panel>
-      </a-collapse>
+          <div style="text-align:center;">
+            <span style="color: #00aaff;cursor:pointer" @click.stop="handleEditBase"><a-icon type="edit" /> 编辑基础信息</span>
+          </div>
+        </div>
+      </a-card>
       <!-- 财务明细 -->
       <a-card :bordered="false" size="small" class="financialCollectionAddcont" v-if="$route.params.sn">
         <div slot="title">
@@ -211,6 +216,7 @@ export default {
       openBaseModal: false,
       openDepartUserModal: false,
       openFcDetailModal: false, // 财务明细弹框
+      showDetail: false,
       total: 0,
       loadData: parameter => {
         const params = Object.assign(parameter, { bookSn: this.$route.params.sn })
@@ -497,7 +503,7 @@ export default {
       height: 100%;
     }
     .financialCollectionAddcont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .affix{
       .ant-affix{

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

@@ -189,8 +189,8 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;margin-top: 50px;">
+              <a-button @click="cancel" style="margin-right: 15px" id="chooseCustom-btn-back">取消</a-button>
               <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
-              <a-button @click="cancel" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
             </a-form-model-item>
           </a-col>
         </a-row>

+ 85 - 79
src/views/financialManagement/financialCollection/list.vue

@@ -1,102 +1,107 @@
 <template>
-  <a-card size="small" :bordered="false" class="financialCollectionList-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="creatDate" @change="dateChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="收款单号">
+              <a-input id="financialCollectionList-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入收款单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="关联单据单号">
+              <a-input id="financialCollectionList-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="申请人">
+                <employee style="width: 100%;" id="financialCollectionList-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="创建时间">
-                <rangeDate ref="rangeDate" :value="creatDate" @change="dateChange" />
+              <a-form-item label="收款事由">
+                <a-input id="financialCollectionList-bookReason" v-model.trim="queryParam.bookReason" allowClear placeholder="请输入收款事由"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="收款单号">
-                <a-input id="financialCollectionList-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入收款单号"/>
+              <a-form-item label="付款方类型">
+                <v-select
+                  v-model="queryParam.payerType"
+                  ref="payType"
+                  code="PAYER_TYPE"
+                  placeholder="请选择付款方式类型"
+                  allowClear></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="关联单据单号">
-                <a-input id="financialCollectionList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入关联单据单号"/>
+              <a-form-item label="付款方">
+                <a-input id="financialCollectionList-payerNames" v-model.trim="queryParam.payerName" allowClear placeholder="请输入付款方"/>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="申请人">
-                  <employee style="width: 100%;" id="financialCollectionList-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="收款事由">
-                  <a-input id="financialCollectionList-bookReason" v-model.trim="queryParam.bookReason" allowClear placeholder="请输入收款事由"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="付款方类型">
-                  <v-select
-                    v-model="queryParam.payerType"
-                    ref="payType"
-                    code="PAYER_TYPE"
-                    placeholder="请选择付款方式类型"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="付款方">
-                  <a-input id="financialCollectionList-payerNames" v-model.trim="queryParam.payerName" allowClear placeholder="请输入付款方"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="审核时间">
-                  <rangeDate ref="rangeAuditDate" :value="auditDate" @change="dateAuditChange" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="状态">
-                  <v-select
-                    v-model="queryParam.status"
-                    ref="status"
-                    id="financialCollectionList-status"
-                    code="FINANCE_BOOK_STATE"
-                    placeholder="请选择状态"
-                    allowClear></v-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="financialCollectionList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="financialCollectionList-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="审核时间">
+                <rangeDate ref="rangeAuditDate" :value="auditDate" @change="dateAuditChange" />
+              </a-form-item>
             </a-col>
-          </a-row>
-        </a-form>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="状态">
+                <v-select
+                  v-model="queryParam.status"
+                  ref="status"
+                  id="financialCollectionList-status"
+                  code="FINANCE_BOOK_STATE"
+                  placeholder="请选择状态"
+                  allowClear></v-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="financialCollectionList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="financialCollectionList-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="financialCollectionList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
-        <div class="table-operator" v-if="$hasPermissions('B_fc_new')">
-          <a-button type="primary" class="button-error" @click="handleAdd">新增</a-button>
-        </div>
-        <a-alert type="info" style="margin-bottom:10px">
-          <div slot="message">
-            订单总金额:{{ toThousands(countData&&countData.orderTotalAmount||0) }};
-            收款总金额:{{ toThousands(countData&&countData.receiptTotalAmount||0) }};
-            使用授信总金额:{{ toThousands(countData&&countData.useTotalAmount||0) }};
-            授信还款总金额:{{ toThousands(countData&&countData.payTotalAmount||0) }};
-            余款抵扣总金额:{{ toThousands(countData&&countData.balanceTotalAmount||0) }};
+        <div class="table-operator">
+          <div class="flex-center">
+            <a-button type="primary" v-if="$hasPermissions('B_fc_new')" @click="handleAdd">新增</a-button>
+            <div class="tongji-bar">
+              订单总金额:{{ toThousands(countData&&countData.orderTotalAmount||0) }};
+              收款总金额:{{ toThousands(countData&&countData.receiptTotalAmount||0) }};
+              使用授信总金额:{{ toThousands(countData&&countData.useTotalAmount||0) }};
+              授信还款总金额:{{ toThousands(countData&&countData.payTotalAmount||0) }};
+              余款抵扣总金额:{{ toThousands(countData&&countData.balanceTotalAmount||0) }};
+            </div>
           </div>
-        </a-alert>
-      </div>
+          <div></div>
+        </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"
         :scroll="{ y: tableHeight }"
+        :pageSize="30"
         :defaultLoadData="false"
         bordered>
         <!-- 单号 -->
@@ -157,6 +162,7 @@
     <!-- 关联备货单 -->
     <dispatchModal v-drag ref="openDisModal" :openModal="openDisModal" :itemSn="itemSn" @close="openDisModal=false"></dispatchModal>
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -232,7 +238,7 @@ export default {
         { title: '关联单据', scopedSlots: { customRender: 'dispatchNum' }, width: '6%', align: 'center' },
         { title: '申请人', dataIndex: 'applyPersonName', align: 'center', width: '5%', customRender: function (text) { return text || '--' } },
         { title: '收款事由', dataIndex: 'bookReason', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '付款方', dataIndex: 'payerName', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '付款方', dataIndex: 'payerName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '订单总金额', dataIndex: 'orderTotalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '收款总金额', dataIndex: 'receiptTotalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '使用授信总金额', dataIndex: 'useTotalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
@@ -357,7 +363,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 206
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 2 - 2
src/views/financialManagement/warehousingConfirmation/detailModal.vue

@@ -79,8 +79,8 @@ export default {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '7%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '45%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '45%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '入库数量(个)', dataIndex: 'putQty', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       if (this.$hasPermissions('B_warehousingConfirmationDetail_costPrice')) {

+ 42 - 37
src/views/financialManagement/warehousingConfirmation/list.vue

@@ -1,49 +1,52 @@
 <template>
+  <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="入库单号">
+              <a-input id="warehousingConfirmationList-stockPutNo" v-model.trim="queryParam.stockPutNo" allowClear placeholder="请输入入库单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="单据状态">
+              <v-select
+                v-model="queryParam.auditState"
+                ref="auditState"
+                id="warehousingConfirmationList-auditState"
+                code="PUT_CONFIRM_STATE"
+                placeholder="请选择单据状态"
+                allowClear></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>
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="warehousingConfirmationList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="warehousingConfirmationList-reset">重置</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
   <a-card size="small" :bordered="false" class="warehousingConfirmationList-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="入库单号">
-                <a-input id="warehousingConfirmationList-stockPutNo" v-model.trim="queryParam.stockPutNo" allowClear placeholder="请输入入库单号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="单据状态">
-                <v-select
-                  v-model="queryParam.auditState"
-                  ref="auditState"
-                  id="warehousingConfirmationList-auditState"
-                  code="PUT_CONFIRM_STATE"
-                  placeholder="请选择单据状态"
-                  allowClear></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>
-            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="warehousingConfirmationList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="warehousingConfirmationList-reset">重置</a-button>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
       <!-- 列表 -->
       <div v-if="$hasPermissions('B_warehousingConfirmationpl')" style="margin-bottom: 10px">
-        <a-button type="primary" class="button-info" id="warehousingConfirmationList-export" :loading="loading" @click="handleBatchAudit">批量确认</a-button>
-        <span style="margin-left: 5px">
+        <a-button type="primary" id="warehousingConfirmationList-export" :loading="loading" @click="handleBatchAudit">批量确认</a-button>
+        <span style="margin-left: 10px">
           <template v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys.length>0"> {{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }} </template>
         </span>
       </div>
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+70+'px' }"
         size="small"
         :rowKey="(record) => record.stockPutSn"
         rowKeyName="stockPutSn"
@@ -51,6 +54,7 @@
         @rowSelection="rowSelectionFun"
         :columns="columns"
         :data="loadData"
+        :pageSize="30"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         bordered>
@@ -97,6 +101,7 @@
       </div>
     </a-modal>
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -159,7 +164,7 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
       if (this.isShowWarehouse) {
-        arr.splice(3, 0, { title: '仓库', dataIndex: 'warehouseName', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true })
+        arr.splice(3, 0, { title: '仓库', dataIndex: 'warehouseName', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
       }
       if (this.$hasPermissions('M_warehousingConfirmationList_costPrice')) { // 成本价权限
         arr.splice(this.isShowWarehouse?5:4, 0, { title: '入库成本', dataIndex: 'productTotalCost', width: '7%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
@@ -259,7 +264,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 1 - 1
src/views/purchasingManagement/bulkWarehousingOrder/auditNoPassModal.vue

@@ -25,7 +25,7 @@
       </a-table>
     </a-card>
     <div class="btn-cont">
-      <a-button id="bulkWarehousingOrder-auditNo-modal-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
+      <a-button id="bulkWarehousingOrder-auditNo-modal-back" @click="isShow = false">返回列表</a-button>
     </div>
   </a-modal>
 </template>

+ 1 - 1
src/views/purchasingManagement/bulkWarehousingOrder/basicInfoModal.vue

@@ -54,8 +54,8 @@
         </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">
+        <a-button id="bulkWarehousingOrder-basicInfo-modal-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
         <a-button type="primary" id="bulkWarehousingOrder-basicInfo-modal-save" @click="handleSave">保存</a-button>
-        <a-button id="bulkWarehousingOrder-basicInfo-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
       </div>
     </a-spin>
   </a-modal>

+ 4 - 6
src/views/purchasingManagement/bulkWarehousingOrder/detailModal.vue

@@ -12,8 +12,8 @@
       <a-button id="bulkWarehousingOrderDetail-preview-btn" style="margin-right: 15px;">打印预览</a-button>
       <a-button type="primary" id="bulkWarehousingOrderDetail-print-btn">快速打印</a-button>
     </div> -->
-    <!-- 基础信息 -->
     <a-card size="small" :bordered="false" class="bulkWarehousingOrderDetail-cont">
+      <!-- 基础信息 -->
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1">
           <template slot="header">
@@ -27,10 +27,8 @@
           </a-descriptions>
         </a-collapse-panel>
       </a-collapse>
-    </a-card>
-    <a-card size="small" :bordered="false" class="bulkWarehousingOrderDetail-cont">
       <!-- 总计 -->
-      <a-alert type="info" style="margin-bottom:10px">
+      <a-alert type="info" style="margin:10px 0">
         <div slot="message">
           入库数量 <strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
           <span v-if="$hasPermissions('B_sparePartsDetail_costPrice')">入库金额 <strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong></span>
@@ -104,8 +102,8 @@ export default {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', scopedSlots: { customRender: 'productName' }, width: '40%', align: 'center', ellipsis: true },
+        { title: '产品编码', dataIndex: 'productCode', width: '15%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', scopedSlots: { customRender: 'productName' }, width: '40%', align: 'left', ellipsis: true },
         { title: '单位', dataIndex: 'unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库数量', dataIndex: 'productQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]

+ 78 - 58
src/views/purchasingManagement/bulkWarehousingOrder/edit.vue

@@ -6,70 +6,74 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="bulkWarehousingOrderEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ productTotal&&productTotal.sparePartsNo }}</span>
+          <span style="margin: 0 10px;color: #666;">供应商:{{ productTotal&&productTotal.supplierName }}</span>
+          <a-button type="link" size="small" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
       </a-page-header>
       <!-- 基础信息 -->
-      <a-card size="small" :bordered="false" class="bulkWarehousingOrderEdit-cont">
-        <a-collapse :activeKey="['1']" v-if="productTotal">
-          <a-collapse-panel key="1">
-            <template slot="header">
-              基础信息
-            </template>
-            <a-descriptions :column="3">
-              <a-descriptions-item label="供应商">{{ (productTotal&&productTotal.supplierName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="入库类型">{{ (productTotal&&productTotal.sparePartsTypeDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="入库仓库">{{ (productTotal&&productTotal.warehouseName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="入库单号">{{ (productTotal&&productTotal.sparePartsNo) || '--' }}</a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+      <a-card size="small" :bordered="false" class="bulkWarehousingOrderEdit-cont" v-show="showDetail">
+        <div v-if="productTotal" ref="detailBar">
+           <a-descriptions :column="2">
+             <a-descriptions-item label="入库单号">{{ (productTotal&&productTotal.sparePartsNo) || '--' }}</a-descriptions-item>
+             <a-descriptions-item label="供应商">{{ (productTotal&&productTotal.supplierName) || '--' }}</a-descriptions-item>
+             <a-descriptions-item label="入库类型">{{ (productTotal&&productTotal.sparePartsTypeDictValue) || '--' }}</a-descriptions-item>
+             <a-descriptions-item label="入库仓库">{{ (productTotal&&productTotal.warehouseName) || '--' }}</a-descriptions-item>
+           </a-descriptions>
+        </div>
       </a-card>
       <a-card size="small" :bordered="false" class="bulkWarehousingOrderEdit-cont">
-        <!-- 操作按钮 -->
-        <div class="table-operator" style="display: flex;align-items:center;">
-          <div>
-            <a-button id="bulkWarehousingOrderEdit-add" type="primary" class="button-primary" @click="handleEdit()">新增产品</a-button>
-            <a-button id="bulkWarehousingOrderEdit-import" type="default" class="button-primary" @click="openGuideModal=true">导入产品</a-button>
+        <div ref="toolsBar">
+          <!-- 筛选条件 -->
+          <div 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="产品编码" prop="productCode">
+                    <a-input id="allocateBillEdit-productCode" v-model.trim="queryParam.productCode" placeholder="请输入产品编码" allowClear />
+                  </a-form-item>
+                </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="产品名称" prop="productName">
+                    <a-input id="allocateBillEdit-productName" v-model.trim="queryParam.productName" placeholder="请输入产品名称" allowClear />
+                  </a-form-item>
+                </a-col>
+                <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+                  <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderEdit-refresh">查询</a-button>
+                  <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="bulkWarehousingOrderEdit-reset">重置</a-button>
+                </a-col>
+              </a-row>
+            </a-form>
           </div>
-          <!-- 总计 -->
-          <a-alert type="info" v-if="productTotal">
-            <div slot="message">
-              入库数量 <strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
-              <span v-if="$hasPermissions('B_sparePartsEdit_costPrice')">
-                入库金额 <strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong>
-              </span>
+          <!-- 操作按钮 -->
+          <div class="table-operator" style="display: flex;align-items:center;">
+            <div>
+              <a-button id="bulkWarehousingOrderEdit-add" type="primary" class="button-primary" @click="handleEdit()">新增产品</a-button>
+              <a-button id="bulkWarehousingOrderEdit-import" type="default" class="button-primary" @click="openGuideModal=true">导入产品</a-button>
             </div>
-          </a-alert>
-        </div>
-        <!-- 筛选条件 -->
-        <div 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="产品编码" prop="productCode">
-                  <a-input id="allocateBillEdit-productCode" v-model.trim="queryParam.productCode" placeholder="请输入产品编码" allowClear />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="产品名称" prop="productName">
-                  <a-input id="allocateBillEdit-productName" v-model.trim="queryParam.productName" placeholder="请输入产品名称" allowClear />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderEdit-refresh">查询</a-button>
-                <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="bulkWarehousingOrderEdit-reset">重置</a-button>
-              </a-col>
-            </a-row>
-          </a-form>
+            <!-- 总计 -->
+            <a-alert type="info" v-if="productTotal">
+              <div slot="message">
+                入库数量 <strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
+                <span v-if="$hasPermissions('B_sparePartsEdit_costPrice')">
+                  入库金额 <strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong>
+                </span>
+              </div>
+            </a-alert>
+          </div>
         </div>
         <!-- 列表 -->
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
+          :style="{ height: tableHeight+70+'px' }"
           ref="table"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>
           <!-- 操作 -->
@@ -103,7 +107,7 @@
         size="large"
         class="button-primary"
         @click="handleBack"
-        style="padding: 0 60px;">保存并返回</a-button>
+        style="padding: 0 60px;">保存</a-button>
     </div>
     <spare-parts-product-modal :openModal="openModal" :itemSn="itemSn" :nowData="productTotal" @ok="$refs.table.refresh(true)" @close="closeModal" />
     <!-- 导入产品 -->
@@ -126,6 +130,7 @@ export default {
     return {
       spinning: false,
       disabled: false,
+      showDetail: false,
       queryParam: {
         productCode: '',
         productName: ''
@@ -151,15 +156,16 @@ export default {
       basicInfoData: null, //  基本信息
       productTotal: null, //  合计
       itemSn: '',
-      openGuideModal: false //  导入产品引导
+      openGuideModal: false ,//  导入产品引导
+      tableHeight: 0
     }
   },
   computed: {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', scopedSlots: { customRender: 'productName' }, width: '25%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', scopedSlots: { customRender: 'productName' }, width: '25%', align: 'left' },
         { title: '单位', dataIndex: 'unit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库数量', dataIndex: 'productQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
@@ -171,12 +177,29 @@ export default {
       return arr
     }
   },
+  watch: {
+    showDetail(newValue, oldValue){
+      this.setTableH()
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   methods: {
     //  添加/编辑
     handleEdit (row) {
       this.itemSn = (row && row.sparePartsDetailSn) ? row.sparePartsDetailSn : null
       this.openModal = true
     },
+    setTableH () {
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        const toolsBarH = this.$refs.toolsBar.offsetHeight
+        this.tableHeight = window.innerHeight - toolsBarH - 282
+        if(this.showDetail){
+          this.tableHeight = this.tableHeight - this.$refs.detailBar.offsetHeight - 30
+        }
+      })
+    },
     // 关闭
     closeModal () {
       this.itemSn = ''
@@ -237,6 +260,7 @@ export default {
       this.productTotal = null
       this.openModal = false
       this.$refs.table.refresh(true)
+      this.setTableH()
     }
   },
   mounted () {
@@ -262,12 +286,8 @@ export default {
     height: 100%;
     padding-bottom: 51px;
     box-sizing: border-box;
-    >.ant-spin-nested-loading{
-      overflow-y: scroll;
-      height: 100%;
-    }
     .bulkWarehousingOrderEdit-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
       .table-operator{
         border: 0;
         padding-top: 0;

+ 44 - 38
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="bulkWarehousingOrderList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="searchBox">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -25,12 +25,13 @@
                 <a-input id="bulkWarehousingOrderList-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入商户名称"/>
               </a-form-item>
             </a-col>
+          <template v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-item label="金蝶单号">
                 <a-input id="bulkWarehousingOrderList-kingdeeNo" v-model.trim="queryParam.kingdeeNo" allowClear placeholder="请输入金蝶单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="入库类型">
                 <v-select
                   v-model="queryParam.sparePartsType"
@@ -41,7 +42,7 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24" v-show="isShowWarehouse">
+            <a-col :md="6" :sm="24" v-show="isShowWarehouse">
                 <a-form-item label="入库仓库">
                   <warehouse
                     v-model="queryParam.warehouseSn"
@@ -51,7 +52,7 @@
                   />
                 </a-form-item>
               </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="状态">
                 <v-select
                   v-model="queryParam.state"
@@ -63,27 +64,34 @@
                 ></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderList-refresh">查询</a-button>
-                <a-button style="margin-left: 5px" @click="resetSearchForm()" :disabled="disabled" id="bulkWarehousingOrderList-reset">重置</a-button>
-                <a-button
-                  style="margin-left: 10px"
-                  v-if="$hasPermissions('B_sparePartsExport')"
-                  type="primary"
-                  class="button-warning"
-                  @click="handleExport"
-                  :disabled="disabled"
-                  :loading="exportLoading"
-                >导出明细</a-button>
-              </span>
+          </template>
+            <a-col :md="24" :sm="24" style="text-align: center;">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderList-refresh">查询</a-button>
+              <a-button style="margin-left: 10px" @click="resetSearchForm()" :disabled="disabled" id="bulkWarehousingOrderList-reset">重置</a-button>
+              <a-button
+                style="margin-left: 10px"
+                v-if="$hasPermissions('B_sparePartsExport')"
+                type="primary"
+                class="button-warning"
+                @click="handleExport"
+                :disabled="disabled"
+                :loading="exportLoading"
+              >导出明细</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 8px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
             </a-col>
           </a-row>
         </a-form>
       </div>
+    </a-card>
+  
+  <a-card size="small" :bordered="false" class="bulkWarehousingOrderList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button v-if="$hasPermissions('B_sparePartsNew')" id="bulkWarehousingOrderList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
+        <a-button v-if="$hasPermissions('B_sparePartsNew')" id="bulkWarehousingOrderList-add" type="primary" @click="handleAdd">新增</a-button>
         <a-button
           v-if="$hasPermissions('B_sparePartsBatchAudit')"
           id="bulkWarehousingOrderList-batchAudit"
@@ -91,8 +99,8 @@
           class="button-warning"
           :loading="loading"
           @click="handleBatchAudit"
-          style="margin: 0 15px;">批量审核</a-button>
-        <span style="margin-left: 8px">
+          style="margin: 0 3px;">批量审核</a-button>
+        <span style="margin-left: 10px">
           <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
         </span>
       </div>
@@ -100,13 +108,14 @@
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+70+'px' }"
         size="small"
         :rowKey="(record) => record.sparePartsSn"
         rowKeyName="sparePartsSn"
         :row-selection="$hasPermissions('B_sparePartsBatchAudit')?{ columnWidth: '4%', getCheckboxProps: record => ({ props: { disabled: record.state != 'WAIT_AUDIT' } }) }:null"
         @rowSelection="rowSelectionFun"
         :columns="columns"
+        :pageSize="30"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
@@ -152,6 +161,7 @@
     <auditNoPassModal v-drag ref="auditNoPassModal" :openModal="openAuditNoModal" @close="openAuditNoModal=false" />
     <batchAuditNoModal v-drag ref="batchAuditNoModal" :openModal="openBatchAuditNoModal" @close="openBatchAuditNoModal=false" @ok="hanldeAuditOk" />
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -178,6 +188,7 @@ export default {
       exportLoading: false,
       openAuditNoModal: false,
       openBatchAuditNoModal: false,
+      advanced: true,
       tableHeight: 0,
       // 查询参数
       queryParam: {
@@ -218,8 +229,8 @@ export default {
 	  columns () {
 	    const arr = [
 	      { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-	      { title: '入库单号', scopedSlots: { customRender: 'sparePartsNo' }, width: '10%', align: 'center' },
-	      { title: '商户名称', dataIndex: 'supplierName', align: 'center', width: '12%', customRender: function (text) { return text || '--' }, ellipsis: true },
+	      { title: '入库单号', scopedSlots: { customRender: 'sparePartsNo' }, width: '8%', align: 'center' },
+	      { title: '商户名称', dataIndex: 'supplierName', align: 'left', width: '12%', customRender: function (text) { return text || '--' }, ellipsis: true },
 	      { title: '入库数量', dataIndex: 'productTotalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
 	      // { title: '入库成本', dataIndex: 'productTotalCost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
 	      { title: '入库类型', dataIndex: 'sparePartsTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -235,7 +246,7 @@ export default {
 	      arr.splice(4, 0, { title: '入库成本', dataIndex: 'productTotalCost', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
 	    }
       if (this.isShowWarehouse) {
-        arr.splice(this.$hasPermissions('M_bulkWarehousingOrderList_costPrice')?6:5, 0, { title: '入库仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
+        arr.splice(this.$hasPermissions('M_bulkWarehousingOrderList_costPrice')?6:5, 0, { title: '入库仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } })
       }
 	    return arr
 	  }
@@ -380,10 +391,16 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 240
+      this.tableHeight = window.innerHeight - tableSearchH - 250
     }
   },
   watch: {
+    advanced (newValue, oldValue) {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
       this.setTableH()
     }
@@ -411,14 +428,3 @@ export default {
   }
 }
 </script>
-<style lang="less">
-  .bulkWarehousingOrderList-wrap{
-    .active{
-      color: #ed1c24;
-      cursor: pointer;
-    }
-    .common{
-      color: rgba(0, 0, 0);
-    }
-  }
-</style>

+ 4 - 1
src/views/purchasingManagement/bulkWarehousingOrder/productModal.vue

@@ -69,8 +69,8 @@
             style="width: 50%;margin-right:20px;" /><span>个</span>
         </a-form-model-item>
         <div class="btn-cont">
+          <a-button id="bulkWarehousingOrder-product-modal-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
           <a-button type="primary" id="bulkWarehousingOrder-product-modal-save" @click="handleSave">{{ itemSn?'保存':'保存并新增' }}</a-button>
-          <a-button id="bulkWarehousingOrder-product-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
         </div>
       </a-form-model>
     </a-spin>
@@ -326,6 +326,9 @@ export default {
   .bulkWarehousingOrder-product-modal{
     .ant-modal-body {
       padding: 40px 40px 24px;
+      .ant-form-item{
+        margin-bottom: 10px;
+      }
     }
     .btn-cont {
       text-align: center;

+ 16 - 4
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="bulkWarehousingOrderList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <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)">
@@ -20,6 +20,7 @@
                 <supplier v-model="queryParam.supplierSn" isPermission placeholder="请输入供应商名称"></supplier>
               </a-form-item>
             </a-col>
+          <template v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-item label="退货原因">
                 <v-select
@@ -53,10 +54,11 @@
                 ></v-select>
               </a-form-item>
             </a-col>
+            </template>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderList-refresh">查询</a-button>
-                <a-button style="margin-left: 5px" @click="resetSearchForm()" :disabled="disabled" id="bulkWarehousingOrderList-reset">重置</a-button>
+                <a-button style="margin-left: 10px" @click="resetSearchForm()" :disabled="disabled" id="bulkWarehousingOrderList-reset">重置</a-button>
                 <a-button
                   style="margin-left: 10px"
                   type="primary"
@@ -66,11 +68,18 @@
                   :loading="exportLoading"
                   v-if="$hasPermissions('B_purchaseReturnExport')"
                 >导出明细</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="bulkWarehousingOrderList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
       <div class="table-operator">
         <a-button v-if="$hasPermissions('B_purchaseReturnAdd')" id="bulkWarehousingOrderList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
@@ -87,11 +96,12 @@
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+70+'px' }"
         size="small"
         :rowKey="(record) => record.sparePartsReturnNo"
         :columns="columns"
         :data="loadData"
+        :pageSize="30"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         bordered>
@@ -149,6 +159,7 @@
     <!-- 审核进度弹窗 -->
     <reviewProgressModal v-drag :itemSn="itemSnSh" :auditTime="auditTime" :openModal="openReviewModal" @close="openReviewModal=false"></reviewProgressModal>
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -177,6 +188,7 @@ export default {
       openReviewModal: false, // 审核进度弹窗
       showExport: false,
       exportLoading: false,
+      advanced: true,
       tableHeight: 0,
       // 查询参数
       queryParam: {

+ 32 - 31
src/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue

@@ -8,38 +8,38 @@
             <a-icon type="left" />
             返回列表
           </a>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailsData&&detailsData.sparePartsReturnNo }}</span>
+          <span style="margin: 0 10px;color: #666;">供应商:{{ detailsData && detailsData.supplier && detailsData.supplier.supplierName }}</span>
+          <a-button type="link" size="small" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
       </a-page-header>
-      <a-card size="small" :bordered="false" class="outboundOrderDetail-cont">
-        <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" header="基础信息">
-            <div slot="extra" style="padding: 0 20px; color: #00aaff;" @click.stop="handleEditBase">
-              <a-icon type="edit" />
-              编辑基础信息
-            </div>
-            <a-descriptions size="small" :column="4" style="margin-bottom: 10px;">
-              <a-descriptions-item label="采购退货单号">{{ (detailsData && detailsData.sparePartsReturnNo) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="供应商名称">{{ (detailsData && detailsData.supplier && detailsData.supplier.supplierName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="退货原因">{{ (detailsData && detailsData.returnReasonDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="退货仓库">{{ detailsData&&detailsData.warehouseName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="补充说明">{{ (detailsData && detailsData.explainInfo) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="附件" :span="3">
-                <span v-if="detailsData && detailsData.attachmentList && detailsData.attachmentList.length > 0">
-                  <a
-                    target="_blank"
-                    style="color: #00aaff;text-decoration: underline;margin-right: 15px;"
-                    :href="item.filePath"
-                    v-for="item in detailsData.attachmentList"
-                    :key="item.id"
-                  >
-                    {{ item.fileName }}
-                  </a>
-                </span>
-                <span v-else>--</span>
-              </a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+      <a-card size="small" :bordered="false" class="salesReturnEdit-cont" v-show="showDetail">
+         <a-descriptions size="small" :column="4" style="margin-bottom: 10px;">
+           <a-descriptions-item label="采购退货单号">{{ (detailsData && detailsData.sparePartsReturnNo) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="供应商名称">{{ (detailsData && detailsData.supplier && detailsData.supplier.supplierName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="退货原因">{{ (detailsData && detailsData.returnReasonDictValue) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="退货仓库">{{ detailsData&&detailsData.warehouseName || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="补充说明">{{ (detailsData && detailsData.explainInfo) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="附件" :span="3">
+             <span v-if="detailsData && detailsData.attachmentList && detailsData.attachmentList.length > 0">
+               <a
+                 target="_blank"
+                 style="color: #00aaff;text-decoration: underline;margin-right: 15px;"
+                 :href="item.filePath"
+                 v-for="item in detailsData.attachmentList"
+                 :key="item.id"
+               >
+                 {{ item.fileName }}
+               </a>
+             </span>
+             <span v-else>--</span>
+           </a-descriptions-item>
+         </a-descriptions>
+         <div style="text-align:center;">
+           <span style="color: #00aaff;cursor:pointer" @click.stop="handleEditBase"><a-icon type="edit" /> 编辑基础信息</span>
+         </div>
       </a-card>
       <a-card size="small" :bordered="false" class="salesReturnEdit-cont">
         <queryPart ref="partQuery" :newLoading="isInster" :addMoreLoading="addMoreLoading" @add="saveProduct" @bachAdd="saveMoreProduct"></queryPart>
@@ -161,6 +161,7 @@ export default {
       isInster: false, // 是否正在添加产品
       openDepartUserModal: false, // 审核人员弹窗
       delLoading: false,
+      showDetail: false,
       productForm: {
         productName: '',
         productCode: '',
@@ -519,7 +520,7 @@ export default {
     height: 100%;
   }
   .salesReturnEdit-cont {
-    margin-top: 10px;
+    margin-top: 6px;
     .ant-divider-horizontal {
       margin: 10px 0 24px;
     }

+ 6 - 4
src/views/purchasingManagement/purchaseReturn/queryPart.vue

@@ -2,7 +2,7 @@
   <div class="salesReturnList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
-      <div style="width:80%">
+      <div style="width:100%">
         <a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="5" :sm="24">
@@ -29,9 +29,11 @@
               <a-button type="primary" @click="$refs.chooseTable.refresh(true)" id="salesReturnList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" id="salesReturnList-reset">重置</a-button>
             </a-col>
-            <a-col :md="12" :sm="24" style="margin-bottom: 10px;display: flex;align-items: center;">
-              <a-button type="primary" style="margin-right: 5px" @click="handleBatchAdd" :loading="addMoreLoading">批量添加</a-button>
-              <span v-if="selNums&&selNums!=0" style="margin:0 10px;">已选中{{ selNums }}项</span>
+            <a-col :md="24" :sm="24" style="margin-bottom: 10px;display: flex;align-items: center;justify-content: space-between;">
+              <div>
+                <a-button type="primary" style="margin-right: 5px" @click="handleBatchAdd" :loading="addMoreLoading">批量添加</a-button>
+                <span v-if="selNums&&selNums!=0" style="margin:0 10px;">已选中{{ selNums }}项</span>
+              </div>
               <a-checkbox @change="onChange" :checked="isChecked">
                 显示最大可退数量为0的产品
               </a-checkbox>

+ 69 - 58
src/views/salesReturnManagement/receiveCheck/list.vue

@@ -1,71 +1,75 @@
 <template>
+  <div>
+  <a-card size="small" :bordered="false" class="receiveCheck-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="rangeExamineDate" @change="dateExamineChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="总部销退单号">
+              <a-input id="receiveCheck-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="客户名称">
+              <dealerSubareaScopeList ref="dealerSubareaScopeList" id="receiveCheck-buyerSn" @change="custChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="退货类别">
+              <v-select
+                v-model="queryParam.goodFlag"
+                ref="goodFlag"
+                id="receiveCheck-goodFlag"
+                code="GOOD_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="receiveCheck-billStatus"
+                code="SALES_RETURN_BILL_STATUS"
+                :notIn="['WAIT_SUBMIT', 'WAIT_AUDIT', 'AUDIT_REJECT']"
+                placeholder="请选择业务状态"
+                allowClear></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>
+          <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>
+  </a-card>
   <a-card size="small" :bordered="false" class="receiveCheck-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="rangeExamineDate" @change="dateExamineChange" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="总部销退单号">
-                <a-input id="receiveCheck-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="客户名称">
-                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="receiveCheck-buyerSn" @change="custChange" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="退货类别">
-                <v-select
-                  v-model="queryParam.goodFlag"
-                  ref="goodFlag"
-                  id="receiveCheck-goodFlag"
-                  code="GOOD_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="receiveCheck-billStatus"
-                  code="SALES_RETURN_BILL_STATUS"
-                  :notIn="['WAIT_SUBMIT', 'WAIT_AUDIT', 'AUDIT_REJECT']"
-                  placeholder="请选择业务状态"
-                  allowClear></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>
-            <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>
       <!-- 列表 -->
       <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"
         :data="loadData"
+        :pageSize="30"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         bordered>
@@ -113,6 +117,7 @@
       <printModal ref="printModel" @cancel="showTipModal=false"></printModal>
     </commonModal>
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -245,7 +250,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 180
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     },
     canselPrintView () {
       this.showTipModal = false
@@ -294,6 +299,12 @@ export default {
 </script>
 <style lang="less">
   .receiveCheck-wrap{
+    margin-bottom: 6px;
+    &:first-child{
+      .ant-card-body{
+        padding-bottom: 0;
+      }
+    }
     .sTable{
       .badge-con-t{
         .ant-badge-count{

+ 1 - 1
src/views/salesReturnManagement/returnConfirmation/detailModal.vue

@@ -7,7 +7,7 @@
     title="详情"
     v-model="isShow"
     @cancel="isShow=false"
-    width="80%">
+    width="70%">
     <div>
       <!-- <div style="padding: 0 12px;text-align: right;">
         <a-button id="outboundOrderDetail-preview-btn" style="margin-right: 15px;">打印预览</a-button>

+ 87 - 82
src/views/salesReturnManagement/returnConfirmation/list.vue

@@ -1,94 +1,99 @@
 <template>
+  <div>
   <a-card size="small" :bordered="false" class="returnConfirmationList-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" @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="returnConfirmationList-buyerSn" @change="custChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="销退单号">
+              <a-input id="returnConfirmationList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" 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="returnConfirmationList-salesReturnBillSource"
+                code="SALES_SOURCE"
+                placeholder="请选择单据来源"
+                allowClear></v-select>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-item label="创建时间">
-                <rangeDate ref="rangeDate" @change="dateChange" />
+              <a-form-item label="状态">
+                <v-select
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  id="returnConfirmationList-billStatus"
+                  code="SALES_RETURN_CONFIRM_STATUS"
+                  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="returnConfirmationList-buyerSn" @change="custChange" />
-              </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="returnConfirmationList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入销退单号"/>
-              </a-form-item>
+              <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>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="单据来源">
-                  <v-select
-                    v-model="queryParam.salesReturnBillSource"
-                    ref="salesReturnBillSource"
-                    id="returnConfirmationList-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.billStatus"
-                    ref="billStatus"
-                    id="returnConfirmationList-billStatus"
-                    code="SALES_RETURN_CONFIRM_STATUS"
-                    placeholder="请选择状态"
-                    allowClear></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>
-              <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>
-            </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="returnConfirmationList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="returnConfirmationList-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-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-row>
-        </a-form>
-      </div>
+          </template>
+          <a-col :md="24" :sm="24" style="text-align: center;">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="returnConfirmationList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="returnConfirmationList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 8px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>  
+  
+  <a-card size="small" :bordered="false" class="returnConfirmationList-wrap">
+    <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"
+        :pageSize="30"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
@@ -114,6 +119,7 @@
     <!-- 查看 -->
     <confirmation-detail-modal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -268,7 +274,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 200
+      this.tableHeight = window.innerHeight - tableSearchH - 210
     }
   },
   watch: {
@@ -308,12 +314,11 @@ export default {
 
 <style lang="less">
   .returnConfirmationList-wrap{
-    .active{
-      color: #ed1c24;
-      cursor: pointer;
-    }
-    .common{
-      color: rgba(0, 0, 0);
-    }
+     margin-bottom: 6px;
+     &:first-child{
+       .ant-card-body{
+         padding-bottom: 10px;
+       }
+     }
   }
 </style>

+ 17 - 16
src/views/salesReturnManagement/returnSchedule/list.vue

@@ -27,12 +27,12 @@
                 <subarea id="returnSchedule-subareaSn" 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="returnSchedule-buyerSn" @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="returnSchedule-buyerSn" @change="custChange" />
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="总部销退单号">
                   <a-input id="returnSchedule-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
@@ -92,10 +92,11 @@
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+68+'px' }"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
+          :pageSize="30"
           :data="loadData"
           :scroll="{ x:1300,y: tableHeight }"
           :defaultLoadData="false"
@@ -202,7 +203,7 @@ export default {
         { title: '提交时间', dataIndex: 'submitTime', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
         { title: '单据来源', dataIndex: 'salesReturnBillSourceDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
         { title: '省份', dataIndex: 'provinceName', align: 'center', width: '100px', customRender: function (text) { return text || '--' }, fixed: 'left' },
-        { title: '客户名称', dataIndex: 'buyerName', align: 'center', width: '200px', customRender: function (text) { return text || '--' }, ellipsis: true, fixed: 'left' },
+        { title: '客户名称', dataIndex: 'buyerName', align: 'left', width: '200px', customRender: function (text) { return text || '--' }, ellipsis: true, fixed: 'left' },
         { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '130px', align: 'center', fixed: 'left' },
         { title: '退货类别', dataIndex: 'goodFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所在区域', dataIndex: 'subareaArea.subareaName', align: 'center', width: '130px', customRender: function (text) { return text || '--' } },
@@ -295,7 +296,9 @@ export default {
       this.queryParam.salesReturnType = undefined
       this.queryParam.goodFlag = undefined
       this.queryParam.checkflag = undefined
-      this.$refs.dealerSubareaScopeList.resetForm()
+      if(this.advanced){
+         this.$refs.dealerSubareaScopeList.resetForm()
+      }
       this.$refs.table.refresh(true)
     },
     // 详情
@@ -315,7 +318,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 240
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {
@@ -355,16 +358,14 @@ export default {
 
 <style lang="less">
   .returnSchedule-wrap{
-    margin-bottom:10px;
-    .active{
-      color: #ed1c24;
-      cursor: pointer;
-    }
+    margin-bottom:6px;
     .ant-tooltip{
       max-width:300px !important;
     }
-    .common{
-      color: rgba(0, 0, 0);
+    &:first-child{
+      .ant-card-body{
+        padding-bottom: 0;
+      }
     }
   }
 </style>