lilei 1 gadu atpakaļ
vecāks
revīzija
130e7ccef3

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