Ver Fonte

优化查询条件

chenrui há 8 meses atrás
pai
commit
2673579bb8

+ 5 - 5
src/views/numsGoodsShelves/approveStore/list.vue

@@ -9,22 +9,22 @@
       <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="4" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-item label="联系人手机">
                 <a-input id="approveStore-contactPhone" allowClear placeholder="请输入联系人手机" v-model.trim="queryParam.contactPhone"/>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-item label="联系人姓名">
                 <a-input id="approveStore-contactName" allowClear placeholder="请输入联系人姓名" v-model.trim="queryParam.contactName"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-item label="门店名称">
                 <a-input id="approveStore-storeName" allowClear placeholder="请输入门店名称" v-model.trim="queryParam.storeName"/>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-item label="审核状态">
                 <v-select
                   v-model="queryParam.auditStatus"
@@ -35,7 +35,7 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <div>
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="approveStore-refresh">查询</a-button>
                 <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="approveStore-reset">重置</a-button>

+ 1 - 1
src/views/numsGoodsShelves/customerAnalysis/list.vue

@@ -15,7 +15,7 @@
                   <shelfSList id="analysis-shelf" style="width: 100%;" v-model="queryParam.shelfSn"></shelfSList>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="8" :sm="24" style="margin-bottom: 10px;">
+              <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                 <a-button type="primary" @click="$refs.table.refresh(true)" id="userd-refresh">查询</a-button>
                 <a-button type="" @click="reset" style="margin-left: 10px;" id="userd-reset">重置</a-button>
                 <a-button

+ 5 - 5
src/views/numsGoodsShelves/easyPassShopping/index.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="easyPassShopping-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
-      <div class="table-operator">
+      <!-- <div class="table-operator">
         <a-button
           type="primary"
           class="button-info"
@@ -25,7 +25,7 @@
         <div style="margin:10px 0;color:gray;" v-if="$hasPermissions('B_openShopProduct')||$hasPermissions('B_closeShopProduct')">
           {{ shoppingMallStatus=='0'?'开启':'关闭' }}商城后,易码通{{ shoppingMallStatus=='0'?'会':'不会' }}显示商城
         </div>
-      </div>
+      </div> -->
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" id="easyPassShopping-form" @keyup.enter.native="$refs.table.refresh(true)">
@@ -202,7 +202,7 @@ export default {
       this.queryParam.categorySn1 = val[0] ? val[0] : ''
       this.queryParam.categorySn2 = val[1] ? val[1] : ''
     },
-    // 获取产品类目列表
+    // 获取商城类目列表
     getCategoryList () {
       const _this = this
       _this.spinning = true
@@ -267,12 +267,12 @@ export default {
     // 表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 280
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     },
     // 初始化页面
     pageInit () {
       const _this = this
-      this.getShoppingStatus()
+      // this.getShoppingStatus()
       this.getCategoryList()
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()

+ 34 - 40
src/views/numsGoodsShelves/settlementManagement/list.vue

@@ -4,60 +4,54 @@
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row type="flex" :gutter="10">
-            <a-col flex="350px">
+          <a-row :gutter="15">
+            <a-col :md="5" :sm="24">
               <a-form-item label="货架名称">
                 <shelfList id="settle-shelfsn" style="max-width:300px;" v-model="queryParam.shelfSn"></shelfList>
               </a-form-item>
             </a-col>
-            <a-col flex="300px">
+            <a-col :md="5" :sm="24">
               <a-form-item label="关联客户">
                 <custList id="settle-customerName" ref="custList" @change="custChange" v-model="queryParam.customerName"></custList>
               </a-form-item>
             </a-col>
-            <a-col flex="300px">
+            <a-col :md="5" :sm="24">
               <a-form-item label="结算方式">
                 <v-select id="settle-settleType" code="SHELF_SETTLE_TYPE" v-model="queryParam.settleType" allowClear placeholder="请选择状态"></v-select>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col flex="300px">
-                <a-form-item label="待结金额">
-                  <a-input-group>
-                    <a-row>
-                      <a-col :span="11">
-                        <a-input-number
-                          id="settle-beginAmount"
-                          v-model="queryParam.beginAmount"
-                          placeholder="起始金额"
-                          :precision="2"
-                          :min="0"
-                          :max="999999"
-                          style="width: 100%;display: inline-block;"/>
-                      </a-col>
-                      <a-col :span="2"><span style="display: block;text-align: center;line-height: 32px;">至</span></a-col>
-                      <a-col :span="11">
-                        <a-input-number
-                          id="settle-endAmount"
-                          placeholder="截止金额"
-                          :precision="2"
-                          :min="0"
-                          :max="999999"
-                          v-model="queryParam.endAmount"
-                          style="width: 100%;display: inline-block;"/>
-                      </a-col>
-                    </a-row>
-                  </a-input-group>
-                </a-form-item>
-              </a-col>
-            </template>
-            <a-col flex="200px">
+            <a-col :md="5" :sm="24">
+              <a-form-item label="待结金额">
+                <a-input-group>
+                  <a-row>
+                    <a-col :span="11">
+                      <a-input-number
+                        id="settle-beginAmount"
+                        v-model="queryParam.beginAmount"
+                        placeholder="起始金额"
+                        :precision="2"
+                        :min="0"
+                        :max="999999"
+                        style="width: 100%;display: inline-block;"/>
+                    </a-col>
+                    <a-col :span="2"><span style="display: block;text-align: center;line-height: 32px;">至</span></a-col>
+                    <a-col :span="11">
+                      <a-input-number
+                        id="settle-endAmount"
+                        placeholder="截止金额"
+                        :precision="2"
+                        :min="0"
+                        :max="999999"
+                        v-model="queryParam.endAmount"
+                        style="width: 100%;display: inline-block;"/>
+                    </a-col>
+                  </a-row>
+                </a-input-group>
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="settle-refresh" >查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="settle-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>

+ 12 - 11
src/views/numsGoodsShelves/shelfMonitoring/list.vue

@@ -29,23 +29,24 @@
                 <a-input id="shelfMonitoringList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="货位产品状态">
+                <v-select
+                  v-model="queryParam.state"
+                  ref="state"
+                  id="shelfMonitoringList-state"
+                  code="SHELF_PRODUCT_STATE"
+                  placeholder="请选择货位产品状态"
+                  allowClear></v-select>
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="产品名称">
                   <a-input id="shelfMonitoringList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="货位产品状态">
-                  <v-select
-                    v-model="queryParam.state"
-                    ref="state"
-                    id="shelfMonitoringList-state"
-                    code="SHELF_PRODUCT_STATE"
-                    placeholder="请选择货位产品状态"
-                    allowClear></v-select>
-                </a-form-model-item>
-              </a-col>
+
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="滞销天数">
                   <a-input-group>

+ 9 - 9
src/views/numsGoodsShelves/shelfOrder/list.vue

@@ -5,22 +5,17 @@
       <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-col :md="5" :sm="24">
               <a-form-item label="订单编号">
                 <a-input id="shelfOrder-orderBillNo" v-model.trim="queryParam.orderBillNo" allowClear placeholder="请输入订单编号" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-item label="货架名称">
                 <shelfSList id="shelfOrder-shelfname" ref="shelfSList" :showAll="true" mode="multiple" v-model="queryParam.shelfSnList"></shelfSList>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="下单时间">
-                <rangeDate id="shelfOrder-time" ref="rangeDate" :value="time" @change="dateChange" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-item label="订单状态">
                 <v-select
                   v-model="queryParam.billState"
@@ -31,7 +26,12 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24" style="margin-bottom: 10px">
+            <a-col :md="5" :sm="24">
+              <a-form-item label="下单时间">
+                <rangeDate id="shelfOrder-time" ref="rangeDate" :value="time" @change="dateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24" style="margin-bottom: 10px">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shelfOrder-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm(0)" :disabled="disabled" id="shelfOrder-reset">重置</a-button>
             </a-col>

+ 6 - 6
src/views/numsGoodsShelves/vinAnalysis/spList.vue

@@ -13,33 +13,33 @@
         :wrapperCol="wrapperCol"
         @keyup.enter.native="handleSearch" >
         <a-row :gutter="15">
-          <a-col :md="5" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-model-item label="货架名称" prop="shelfSn">
               <shelfSList id="vinAnaly-shelf" v-model="queryParam.shelfSn" @change="shelfChange"></shelfSList>
             </a-form-model-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-model-item label="产品编码">
               <a-input id="vinAnaly-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-model-item label="产品名称">
               <a-input id="vinAnaly-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-model-item label="原厂编码">
               <a-input id="vinAnaly-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
             </a-form-model-item>
           </a-col>
           <template v-if="advanced">
-            <a-col :md="5" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
                 <ProductBrand id="vinAnaly-brandSn" placeholder="请选择产品品牌" v-model="queryParam.brandSn"></ProductBrand>
               </a-form-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="产品分类">
                 <ProductType id="vinAnaly-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="productType"></ProductType>
               </a-form-item>

+ 15 - 16
src/views/purchasingManagement/purchaseReturnApplyForm/list.vue

@@ -22,21 +22,25 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="退货类别">
-                <v-select
-                  v-model="queryParam.goodFlag"
-                  ref="goodFlag"
-                  id="purchaseReturnList-goodFlag"
-                  code="GOOD_FLAG"
-                  placeholder="请选择退货类别"
-                  allowClear></v-select>
+              <a-form-item label="采购退货申请单号">
+                <a-input id="purchaseReturnList-purchaseReturnApplyNo" v-model.trim="queryParam.purchaseReturnApplyNo" allowClear placeholder="请输入采购退货申请单号"/>
               </a-form-item>
             </a-col>
-
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="采购退货申请单号">
-                  <a-input id="purchaseReturnList-purchaseReturnApplyNo" v-model.trim="queryParam.purchaseReturnApplyNo" allowClear placeholder="请输入采购退货申请单号"/>
+                <a-form-item label="退货类别">
+                  <v-select
+                    v-model="queryParam.goodFlag"
+                    ref="goodFlag"
+                    id="purchaseReturnList-goodFlag"
+                    code="GOOD_FLAG"
+                    placeholder="请选择退货类别"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="客服审核时间">
+                  <rangeDate id="purchaseReturnList-auditTime" ref="auditDate" :value="auditTime" @change="auditDateChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -52,11 +56,6 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="客服审核时间">
-                  <rangeDate id="purchaseReturnList-auditTime" ref="auditDate" :value="auditTime" @change="auditDateChange" />
-                </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="purchaseReturnList-refresh">查询</a-button>

+ 17 - 19
src/views/purchasingManagement/signWarehousing/list.vue

@@ -5,41 +5,39 @@
       <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-col :md="5" :sm="24">
               <a-form-item label="创建时间">
                 <rangeDate id="signWarehousingList-time" ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-item label="采购单号">
                 <a-input id="signWarehousingList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-item label="发货单号">
                 <a-input id="signWarehousingList-sendBillNo" v-model.trim="queryParam.sendBillNo" allowClear placeholder="请输入发货单号"/>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="业务状态">
-                  <v-select
-                    v-model="queryParam.auditState"
-                    ref="auditState"
-                    id="chainTransferOutList-auditState"
-                    code="RECEIVING_BILL_STATUS"
-                    placeholder="请选择业务状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-            </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-col :md="5" :sm="24">
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.auditState"
+                  ref="auditState"
+                  id="chainTransferOutList-auditState"
+                  code="RECEIVING_BILL_STATUS"
+                  placeholder="请选择业务状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="signWarehousingList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="signWarehousingList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px" id="signWarehousingList-advanced">
+            <!--  <a @click="advanced=!advanced" style="margin-left: 5px" id="signWarehousingList-advanced">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
+              </a> -->
             </a-col>
           </a-row>
         </a-form>

+ 33 - 33
src/views/salesManagement/salesQuery/list.vue

@@ -27,8 +27,15 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="审核时间">
-                <rangeDate id="salesManagementList-auditTime" ref="auditRangeDate" v-model="auditTime" @change="auditDateChange" />
+              <a-form-item label="单据来源">
+                <v-select
+                  style="width: 100%;"
+                  v-model="queryParam.sourceType"
+                  ref="sourceType"
+                  id="salesManagementList-sourceType"
+                  code="SALES_SOURCE"
+                  placeholder="请选择单据来源"
+                  allowClear></v-select>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
@@ -38,26 +45,13 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="单据来源">
-                  <v-select
-                    style="width: 100%;"
-                    v-model="queryParam.sourceType"
-                    ref="sourceType"
-                    id="salesManagementList-sourceType"
-                    code="SALES_SOURCE"
-                    placeholder="请选择单据来源"
-                    allowClear></v-select>
-                </a-form-item>
+                <a-form-model-item label="客户关系">
+                  <v-select code="CUSTOMER_RELATION_TYPE" id="chainTransferOutList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
+                </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="收款方式">
-                  <v-select
-                    code="SETTLE_STYLE"
-                    id="salesManagementList-settleStyleSn"
-                    v-model="queryParam.settleStyleSn"
-                    allowClear
-                    placeholder="请选择收款方式"
-                  ></v-select>
+                <a-form-item label="采购单号">
+                  <a-input id="salesManagementList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -73,19 +67,19 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="财务状态">
-                  <v-select
-                    v-model="queryParam.financialStatus"
-                    ref="financialStatus"
-                    id="salesManagementList-financialStatus"
-                    code="FINANCIAL_RECEIVE_STATUS"
-                    placeholder="请选择财务状态"
-                    allowClear></v-select>
+                <a-form-item label="审核时间">
+                  <rangeDate id="salesManagementList-auditTime" ref="auditRangeDate" v-model="auditTime" @change="auditDateChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="采购单号">
-                  <a-input id="salesManagementList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
+                <a-form-item label="收款方式">
+                  <v-select
+                    code="SETTLE_STYLE"
+                    id="salesManagementList-settleStyleSn"
+                    v-model="queryParam.settleStyleSn"
+                    allowClear
+                    placeholder="请选择收款方式"
+                  ></v-select>
                 </a-form-item>
               </a-col>
               <a-col :span="6">
@@ -94,9 +88,15 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户关系">
-                  <v-select code="CUSTOMER_RELATION_TYPE" id="chainTransferOutList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
-                </a-form-model-item>
+                <a-form-item label="财务状态">
+                  <v-select
+                    v-model="queryParam.financialStatus"
+                    ref="financialStatus"
+                    id="salesManagementList-financialStatus"
+                    code="FINANCIAL_RECEIVE_STATUS"
+                    placeholder="请选择财务状态"
+                    allowClear></v-select>
+                </a-form-item>
               </a-col>
             </template>
             <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">

+ 54 - 52
src/views/salesManagement/salesQueryNew/list.vue

@@ -21,69 +21,65 @@
                 <custList id="salesManagementList-custList" ref="custList" @change="custChange"></custList>
               </a-form-item>
             </a-col>
-            <a-col :span="6" v-if="advanced">
-              <a-form-item label="收款方式">
-                <v-select
-                  code="SETTLE_STYLE"
-                  id="salesManagementList-settleStyleSn"
-                  v-model="queryParam.settleStyleSn"
-                  allowClear
-                  placeholder="请选择收款方式"
-                ></v-select>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="销售单号">
+                <a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-item>
             </a-col>
-            <a-col :span="6" v-if="advanced">
-              <a-form-item label="业务状态">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="单据来源">
                 <v-select
-                  v-model="queryParam.billStatus"
-                  ref="billStatus"
-                  id="salesManagementList-billStatus"
-                  code="SALES_BILL_STATUS"
-                  placeholder="请选择业务状态"
+                  style="width: 100%;"
+                  v-model="queryParam.sourceType"
+                  ref="sourceType"
+                  id="salesManagementList-sourceType"
+                  code="SALES_SOURCE"
+                  placeholder="请选择单据来源"
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :span="6">
-              <a-form-item label="审核时间">
-                <rangeDate id="salesManagementList-auditDate" ref="auditRangeDate" v-model="auditTime" @change="auditDateChange" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="6">
-              <a-form-item label="销售单号">
-                <a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
-              </a-form-item>
-            </a-col>
             <template v-if="advanced">
-              <a-col :span="6" >
-                <a-form-item label="单据来源">
-                  <v-select
-                    v-model="queryParam.sourceType"
-                    ref="sourceType"
-                    id="salesManagementList-sourceType"
-                    code="SALES_SOURCE"
-                    placeholder="请选择单据来源"
-                    allowClear></v-select>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="出库时间">
+                  <rangeDate id="salesManagementList-outWareTime" ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
                 </a-form-item>
               </a-col>
-              <a-col :span="6">
-                <a-form-item label="财务状态">
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="客户关系">
+                  <v-select code="CUSTOMER_RELATION_TYPE" id="chainTransferOutList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="采购单号">
+                  <a-input id="salesManagementList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="业务状态">
                   <v-select
-                    v-model="queryParam.financialStatus"
-                    ref="financialStatus"
-                    id="salesManagementList-financialStatus"
-                    code="FINANCIAL_RECEIVE_STATUS"
-                    placeholder="请选择财务状态"
+                    v-model="queryParam.billStatus"
+                    @change="setIsHomeNav($route.name, null)"
+                    ref="billStatus"
+                    id="salesManagementList-billStatus"
+                    code="SALES_BILL_STATUS"
+                    placeholder="请选择业务状态"
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :span="6">
-                <a-form-item label="出库时间">
-                  <rangeDate ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
+              <a-col :md="6" :sm="24">
+                <a-form-item label="审核时间">
+                  <rangeDate id="salesManagementList-auditTime" ref="auditRangeDate" v-model="auditTime" @change="auditDateChange" />
                 </a-form-item>
               </a-col>
-              <a-col :span="6">
-                <a-form-item label="采购单号">
-                  <a-input id="salesManagementList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="收款方式">
+                  <v-select
+                    code="SETTLE_STYLE"
+                    id="salesManagementList-settleStyleSn"
+                    v-model="queryParam.settleStyleSn"
+                    allowClear
+                    placeholder="请选择收款方式"
+                  ></v-select>
                 </a-form-item>
               </a-col>
               <a-col :span="6">
@@ -91,10 +87,16 @@
                   <v-select code="FLAG" id="salesManagementList-distributionFlag" v-model="queryParam.distributionFlag" allowClear placeholder="请选择是否铺货出库"></v-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :span="6">
-                <a-form-model-item label="客户关系">
-                  <v-select code="CUSTOMER_RELATION_TYPE" id="salesManagementList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
-                </a-form-model-item>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="财务状态">
+                  <v-select
+                    v-model="queryParam.financialStatus"
+                    ref="financialStatus"
+                    id="salesManagementList-financialStatus"
+                    code="FINANCIAL_RECEIVE_STATUS"
+                    placeholder="请选择财务状态"
+                    allowClear></v-select>
+                </a-form-item>
               </a-col>
             </template>
             <a-col :span="24" style="display:flex;align-items: center;">

+ 5 - 5
src/views/salesManagement/salesReturn/list.vue

@@ -10,11 +10,6 @@
                 <rangeDate id="salesReturn-time" ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="审核时间">
-                <rangeDate id="salesReturn-aduditTime" ref="rangeExamineDate" @change="dateExamineChange" />
-              </a-form-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
                 <custList id="salesReturn-buyerNameCurrent" ref="custList" v-model="queryParam.buyerNameCurrent"></custList>
@@ -38,6 +33,11 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="审核时间">
+                  <rangeDate id="salesReturn-aduditTime" ref="rangeExamineDate" @change="dateExamineChange" />
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户关系">
                   <v-select code="CUSTOMER_RELATION_TYPE" id="chainTransferOutList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>