lilei пре 7 месеци
родитељ
комит
801abec5fa
61 измењених фајлова са 1044 додато и 1064 уклоњено
  1. 6 6
      src/views/allocationManagement/allocateReturnConfirmation/list.vue
  2. 28 28
      src/views/allocationManagement/allocationList/list.vue
  3. 7 7
      src/views/allocationManagement/matchSendOutOrder/list.vue
  4. 25 25
      src/views/allocationManagement/transferOut/list.vue
  5. 7 7
      src/views/allocationManagement/transfersPrint/list.vue
  6. 3 3
      src/views/easyPassManagement/promotionalActivities/list.vue
  7. 4 4
      src/views/easyPassManagement/shoppingProducts/list.vue
  8. 17 17
      src/views/expenseManagement/expenseReimbursement/list.vue
  9. 21 21
      src/views/expenseManagement/expenseReimbursementDetail/list.vue
  10. 29 29
      src/views/financialManagement/collectionDetailStatic/list.vue
  11. 11 11
      src/views/financialManagement/financialCollection/list.vue
  12. 11 11
      src/views/financialManagement/warehousingConfirmation/list.vue
  13. 11 11
      src/views/inventoryManagement/inventoryQuery/list.vue
  14. 24 24
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  15. 10 10
      src/views/productManagement/newProduct/list.vue
  16. 12 12
      src/views/productManagement/priceChangeRecord/list.vue
  17. 21 21
      src/views/productManagement/productInfo/list.vue
  18. 6 6
      src/views/productManagement/productLaunchAudit/list.vue
  19. 8 8
      src/views/productManagement/productLevel/list.vue
  20. 12 12
      src/views/productManagement/productNotOnline/list.vue
  21. 15 15
      src/views/productManagement/productOfflineAudit/list.vue
  22. 10 10
      src/views/productManagement/productPricing/list.vue
  23. 6 6
      src/views/productManagement/productUniversal/list.vue
  24. 9 9
      src/views/purchasingManagement/bulkWarehousingOrder/list.vue
  25. 10 10
      src/views/purchasingManagement/purchaseReceipt/list.vue
  26. 4 4
      src/views/purchasingManagement/purchaseReturn/list.vue
  27. 32 32
      src/views/reportData/allocationDetails/list.vue
  28. 12 12
      src/views/reportData/allocationPresentation/list.vue
  29. 2 2
      src/views/reportData/hPriceDifferenceDetailReport/list.vue
  30. 5 5
      src/views/reportData/priceDifferenceDetailReport/list.vue
  31. 16 27
      src/views/reportData/promotionSalesRealTimeReport/index.vue
  32. 30 30
      src/views/reportData/promotionSalesRealTimeReport/list.vue
  33. 12 12
      src/views/reportData/returnGoodsPresentation/list.vue
  34. 12 13
      src/views/reportData/returnSlipReport/list.vue
  35. 42 42
      src/views/reportData/salesDetails/list.vue
  36. 12 12
      src/views/reportData/salesPresentation/list.vue
  37. 4 4
      src/views/reportData/salesReturnDetailReport/list.vue
  38. 28 34
      src/views/reportData/salesReturnsReport/list.vue
  39. 6 6
      src/views/reportData/tireFeeReport/monthQueryList.vue
  40. 22 22
      src/views/reportData/tireSalesReport/detailList.vue
  41. 7 7
      src/views/reportData/tireSalesReport/list.vue
  42. 13 13
      src/views/reportData/transferReturnDetailReport/list.vue
  43. 10 10
      src/views/reportData/urchaseDetailReturn/detailList.vue
  44. 26 26
      src/views/reportData/warehousingOrderDetail/list.vue
  45. 12 12
      src/views/salesManagement/examineVerify/list.vue
  46. 26 26
      src/views/salesManagement/matchSendOutOrder/list.vue
  47. 23 23
      src/views/salesManagement/outboundOrder/list.vue
  48. 16 16
      src/views/salesManagement/pushOrderManagement/list.vue
  49. 38 38
      src/views/salesManagement/salesCollection/list.vue
  50. 31 31
      src/views/salesManagement/salesList/list.vue
  51. 16 16
      src/views/salesManagement/sendOutOrder/list.vue
  52. 27 27
      src/views/salesManagement/shortageStatisticsC/list.vue
  53. 11 11
      src/views/salesManagement/stockPrint/list.vue
  54. 18 19
      src/views/salesReturnManagement/billOfLading/list.vue
  55. 12 12
      src/views/salesReturnManagement/pickUp/list.vue
  56. 106 107
      src/views/salesReturnManagement/returnConfirmation/list.vue
  57. 26 26
      src/views/salesReturnManagement/returnSchedule/list.vue
  58. 39 39
      src/views/salesReturnManagement/salesReturn/list.vue
  59. 8 8
      src/views/supplierManagement/associatedProductDetails/list.vue
  60. 4 4
      src/views/supplierManagement/costSetRecord/list.vue
  61. 13 13
      src/views/supplierManagement/costSetting/list.vue

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

@@ -36,10 +36,15 @@
                     ref="grabFlag"
                     id="transferReturnConfirmation-grabFlag"
                     code="FLAG"
-                    placeholder="请选择"
+                    placeholder="请选择是否抓单"
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="仓库">
+                  <chooseWarehouse ref="warehouse" id="transferReturnConfirmation-warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="状态">
                   <v-select
@@ -51,11 +56,6 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="仓库">
-                  <chooseWarehouse ref="warehouse" id="transferReturnConfirmation-warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
-                </a-form-model-item>
-              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button

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

@@ -27,19 +27,23 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="费用/调拨类型">
-                <AllocateType
-                  id="allocationList-allocateTypeVal"
-                  v-model="allocateTypeVal"
-                  :changeOnSelect="true"
-                  placeholder="请选择费用/调拨类型"
-                  @change="changeAllocatype"></AllocateType>
+              <a-form-model-item label="调拨单号">
+                <a-input
+                  id="allocationList-allocateNo"
+                  v-model.trim="queryParam.allocateNo"
+                  allowClear
+                  placeholder="请输入调拨单号" />
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="收货客户名称">
-                  <dealerSearchList id="allocationList-receiverSn" ref="receiverSn" @change="custChange" />
+                <a-form-model-item label="费用/调拨类型">
+                  <AllocateType
+                    id="allocationList-allocateTypeVal"
+                    v-model="allocateTypeVal"
+                    :changeOnSelect="true"
+                    placeholder="请选择费用/调拨类型"
+                    @change="changeAllocatype"></AllocateType>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -54,17 +58,14 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="调拨单号">
-                  <a-input
-                    id="allocationList-allocateNo"
-                    v-model.trim="queryParam.allocateNo"
-                    allowClear
-                    placeholder="请输入调拨单号" />
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="调出仓库">
-                  <warehouse v-model="queryParam.warehouseSn" id="allocationList-warehouseSn" placeholder="请选择调出仓库" />
+                <a-form-model-item label="对单状态">
+                  <v-select
+                    v-model="queryParam.checkStatus"
+                    ref="checkStatus"
+                    id="allocationList-checkStatus"
+                    code="CHECK_STATUS"
+                    placeholder="请选择对单状态"
+                    allowClear></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -79,14 +80,13 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="对单状态">
-                  <v-select
-                    v-model="queryParam.checkStatus"
-                    ref="checkStatus"
-                    id="allocationList-checkStatus"
-                    code="CHECK_STATUS"
-                    placeholder="请选择对单状态"
-                    allowClear></v-select>
+                <a-form-model-item label="收货客户名称">
+                  <dealerSearchList id="allocationList-receiverSn" ref="receiverSn" @change="custChange" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="调出仓库">
+                  <warehouse v-model="queryParam.warehouseSn" id="allocationList-warehouseSn" placeholder="请选择调出仓库" />
                 </a-form-model-item>
               </a-col>
             </template>

+ 7 - 7
src/views/allocationManagement/matchSendOutOrder/list.vue

@@ -16,8 +16,8 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="收货客户名称">
-                <dealerSearchList id="matchSendOutOrderList-receiverSn" ref="receiverSn" @change="custChange" />
+              <a-form-item label="调拨单号">
+                <a-input id="matchSendOutOrderList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24" v-show="isShowWarehouse">
@@ -43,11 +43,6 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="调拨单号">
-                  <a-input id="matchSendOutOrderList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="对单状态">
                   <v-select
@@ -60,6 +55,11 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="收货客户名称">
+                  <dealerSearchList id="matchSendOutOrderList-receiverSn" ref="receiverSn" @change="custChange" />
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-item label="客服">
                   <customerService ref="customerName" id="matchSendOutOrderList-bizUserSn" v-model="queryParam.bizUserSn"></customerService>

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

@@ -16,14 +16,14 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="费用/调拨类型">
-                <AllocateType id="transferOutList-costTypeName" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨类型" @change="changeAllocatype"></AllocateType>
+              <a-form-item label="调拨单号">
+                <a-input id="transferOutList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="收货客户名称">
-                  <dealerSearchList id="transferOutList-receiverName" ref="receiverSn" @change="custChange" />
+                <a-form-item label="费用/调拨类型">
+                  <AllocateType id="transferOutList-costTypeName" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨类型" @change="changeAllocatype"></AllocateType>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -39,18 +39,15 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="调拨单号">
-                  <a-input id="transferOutList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="调出仓库">
-                  <warehouse
-                    isPermission
-                    v-model="queryParam.warehouseSn"
-                    id="transferOutList-warehouseSn"
-                    placeholder="请选择调出仓库"
-                  />
+                <a-form-item label="对单状态">
+                  <v-select
+                    v-model="queryParam.checkStatus"
+                    ref="checkStatus"
+                    id="transferOutList-checkStatus"
+                    code="CHECK_STATUS"
+                    placeholder="请选择对单状态"
+                    allowClear
+                  ></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -66,15 +63,18 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="对单状态">
-                  <v-select
-                    v-model="queryParam.checkStatus"
-                    ref="checkStatus"
-                    id="transferOutList-checkStatus"
-                    code="CHECK_STATUS"
-                    placeholder="请选择对单状态"
-                    allowClear
-                  ></v-select>
+                <a-form-item label="收货客户名称">
+                  <dealerSearchList id="transferOutList-receiverName" ref="receiverSn" @change="custChange" />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="调出仓库">
+                  <warehouse
+                    isPermission
+                    v-model="queryParam.warehouseSn"
+                    id="transferOutList-warehouseSn"
+                    placeholder="请选择调出仓库"
+                  />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">

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

@@ -16,8 +16,8 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="收货客户名称">
-                <dealerSearchList id="transfersPrintList-receiver" ref="receiverSn" @change="custChange"/>
+              <a-form-item label="调拨单号">
+                <a-input id="transfersPrintList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24" v-if="currentTab==2&&!isShowCustomerSearch">
@@ -45,11 +45,6 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="调拨单号">
-                  <a-input id="transfersPrintList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24" v-if="currentTab == 1">
                 <a-form-item label="打印状态">
                   <v-select
@@ -62,6 +57,11 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="收货客户名称">
+                  <dealerSearchList id="transfersPrintList-receiver" ref="receiverSn" @change="custChange"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24" v-show="isShowWarehouse">
                 <a-form-item label="调出仓库">
                   <warehouse

+ 3 - 3
src/views/easyPassManagement/promotionalActivities/list.vue

@@ -52,9 +52,9 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator" v-if="$hasPermissions('B_promoActivitiesAdd')">
-          <a-button type="primary" class="button-info" id="promotion-add1-btn" @click="handleEdit('BUY_PROD_GIVE_PROD')">买产品送产品</a-button>
-          <a-button type="primary" class="button-info" id="promotion-add2-btn" @click="handleEdit('PROMO_PROD')">特价产品</a-button>
-          <a-button type="primary" class="button-info" id="promotion-add3-btn" @click="handleEdit('BUY_PROD_GIVE_VALID')">买产品返代金券</a-button>
+          <a-button type="primary" class="button-error" id="promotion-add1-btn" @click="handleEdit('BUY_PROD_GIVE_PROD')">买产品送产品</a-button>
+          <a-button type="primary" class="button-success" id="promotion-add3-btn" @click="handleEdit('BUY_PROD_GIVE_VALID')">买产品返代金券</a-button>
+          <a-button type="primary" class="button-warning" id="promotion-add2-btn" @click="handleEdit('PROMO_PROD')">特价产品</a-button>
         </div>
         <s-table
           class="sTable fixPagination"

+ 4 - 4
src/views/easyPassManagement/shoppingProducts/list.vue

@@ -6,13 +6,13 @@
         <a-form layout="inline" id="shoppingProductsList-form" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="shoppingProductsList-name" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="产品编码/原厂编码">
+                <a-input id="shoppingProductsList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码/原厂编码"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码/原厂编码">
-                <a-input id="shoppingProductsList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码/原厂编码"/>
+              <a-form-item label="产品名称">
+                <a-input id="shoppingProductsList-name" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">

+ 17 - 17
src/views/expenseManagement/expenseReimbursement/list.vue

@@ -5,9 +5,20 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="15">
+            <a-col :md="4" :sm="24">
+              <a-form-item label="费用发生月份">
+                <a-month-picker
+                  placeholder="请选择月份"
+                  locale="zh-cn"
+                  v-model="queryParam.expenseDate"
+                  @change="onChange"
+                  :disabled-date="disabledDate"
+                  style="width: 100%;"/>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="费用单号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <a-input id="salesManagementList-expenseAccountNo" v-model.trim="queryParam.expenseAccountNo" allowClear placeholder="请输入销售单号"/>
+                <a-input id="salesManagementList-expenseAccountNo" v-model.trim="queryParam.expenseAccountNo" allowClear placeholder="请输入费用单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
@@ -26,17 +37,6 @@
                 ></expenseType>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
-              <a-form-item label="费用发生月份">
-                <a-month-picker
-                  placeholder="请选择月份"
-                  locale="zh-cn"
-                  v-model="queryParam.expenseDate"
-                  @change="onChange"
-                  :disabled-date="disabledDate"
-                  style="width: 100%;"/>
-              </a-form-item>
-            </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-item label="主题">
@@ -54,6 +54,11 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <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 :md="4" :sm="24">
                 <a-form-item label="状态">
                   <v-select
@@ -65,11 +70,6 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <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 :md="4" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-item label="客服">
                   <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>

+ 21 - 21
src/views/expenseManagement/expenseReimbursementDetail/list.vue

@@ -26,17 +26,6 @@
                   <department style="width: 100%;" id="expenseReimbursementDetailList-applyDepartmentSn" @change="applyDepartmentChange" v-model="queryParam.applyDepartmentSn"></department>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="费用类型">
-                  <expenseType
-                    id="expenseReimbursementDetailList-expenseType"
-                    v-model="expenseTypes"
-                    :changeOnSelect="true"
-                    @change="expenseChange"
-                    placeholder="请选择费用类型"
-                  ></expenseType>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="费用发生月份">
                   <a-month-picker
@@ -48,6 +37,17 @@
                     style="width: 100%;"/>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="费用类型">
+                  <expenseType
+                    id="expenseReimbursementDetailList-expenseType"
+                    v-model="expenseTypes"
+                    :changeOnSelect="true"
+                    @change="expenseChange"
+                    placeholder="请选择费用类型"
+                  ></expenseType>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="记账类型">
                   <v-select
@@ -76,16 +76,6 @@
                   </a-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="所属区域">
-                  <a-input id="expenseReimbursementDetailList-subarea" v-model.trim="queryParam.subareaArea.subareaName" allowClear placeholder="请输入所属区域"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="所属分区">
-                  <a-input id="expenseReimbursementDetailList-subareaArea" v-model.trim="queryParam.subareaArea.subareaAreaName" allowClear placeholder="请输入所属分区"/>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所属省份">
                   <Area id="expenseReimbursementDetailList-area" placeholder="请选择所属省份" v-model="queryParam.provinceSn"></Area>
@@ -122,6 +112,16 @@
                   </a-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="所属区域">
+                  <a-input id="expenseReimbursementDetailList-subarea" v-model.trim="queryParam.subareaArea.subareaName" allowClear placeholder="请输入所属区域"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="所属分区">
+                  <a-input id="expenseReimbursementDetailList-subareaArea" v-model.trim="queryParam.subareaArea.subareaAreaName" allowClear placeholder="请输入所属分区"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24" v-show="queryParam.splitObjType=='DEPARTMENT'">
                 <a-form-item label="费用承担人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
                   <employee id="expenseReimbursementDetailList-employee" style="width: 100%;" placeholder="请选择承担人员" v-model="queryParam.childSplitObjSn"></employee>

+ 29 - 29
src/views/financialManagement/collectionDetailStatic/list.vue

@@ -36,13 +36,13 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="申请人">
-                <employee style="width: 100%;" id="collectionDetail-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
+              <a-form-item label="收款日期">
+                <rangeDate ref="receiptDate" :value="receiptDate" @change="receiptDateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="收款日期">
-                <rangeDate ref="receiptDate" :value="receiptDate" @change="receiptDateChange" />
+              <a-form-item label="申请人">
+                <employee style="width: 100%;" id="collectionDetail-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -60,6 +60,11 @@
               </a-form-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="开票日期">
+                  <rangeDate ref="invoiceDate" :value="invoiceDate" @change="invoiceDateChange" />
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="财务编码">
                   <a-input id="collectionDetail-kdMidCustomerFnumber" placeholder="请输入财务编码" v-model="queryParam.kdMidCustomerFnumber"></a-input>
@@ -70,18 +75,7 @@
                   <a-input id="collectionDetail-payerAccountInfo" placeholder="请输入付款账户" v-model="queryParam.payerAccountInfo"></a-input>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-item label="足额打款">
-                  <v-select
-                    v-model="queryParam.fullPaymentFlag"
-                    ref="fullPaymentFlag"
-                    id="collectionDetail-fullPaymentFlag"
-                    code="FLAG"
-                    placeholder="请选择是否足额打款"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="户名">
                   <a-select placeholder="请选择户名" allowClear v-model="queryParam.bankAccount" style="width: 100%" @change="handleChange">
                     <a-select-option v-for="item in bankList" :value="item.bankAccount">
@@ -90,28 +84,34 @@
                   </a-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-item label="汇入银行">
-                  <a-select placeholder="请选择汇入银行" allowClear v-model="queryParam.bankName" style="width: 100%">
-                    <a-select-option v-for="item in bankNameList" :value="item">
-                      {{ item }}
-                    </a-select-option>
-                  </a-select>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="所属区域">
+                  <subarea id="collectionDetail-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="开票日期">
-                  <rangeDate ref="invoiceDate" :value="invoiceDate" @change="invoiceDateChange" />
+                <a-form-item label="所属省份">
+                  <Area id="collectionDetail-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="所属区域">
-                  <subarea id="collectionDetail-subarea" ref="subarea" @change="subareaChange"></subarea>
+                <a-form-item label="汇入银行">
+                  <a-select placeholder="请选择汇入银行" allowClear v-model="queryParam.bankName" style="width: 100%">
+                    <a-select-option v-for="item in bankNameList" :value="item">
+                      {{ item }}
+                    </a-select-option>
+                  </a-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="所属省份">
-                  <Area id="collectionDetail-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
+                <a-form-item label="是否足额打款">
+                  <v-select
+                    v-model="queryParam.fullPaymentFlag"
+                    ref="fullPaymentFlag"
+                    id="collectionDetail-fullPaymentFlag"
+                    code="FLAG"
+                    placeholder="请选择是否足额打款"
+                    allowClear></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">

+ 11 - 11
src/views/financialManagement/financialCollection/list.vue

@@ -16,19 +16,24 @@
               </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="申请人">
+                <employee style="width: 100%;" id="financialCollectionList-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
               </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 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-bookReason" v-model.trim="queryParam.bookReason" allowClear placeholder="请输入收款事由"/>
+                <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="关联单据单号">
+                  <a-input id="financialCollectionList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入关联单据单号"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -46,11 +51,6 @@
                   <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

+ 11 - 11
src/views/financialManagement/warehousingConfirmation/list.vue

@@ -10,17 +10,6 @@
                 <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">
               <a-form-item label="业务单号">
                 <a-input id="warehousingConfirmationList-putBizNo" v-model.trim="queryParam.putBizNo" allowClear placeholder="请输入业务单号"/>
@@ -36,6 +25,17 @@
                   allowClear></v-select>
               </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>

+ 11 - 11
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -11,16 +11,21 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="原厂编码">
-                <a-input id="inventoryQueryList-productOrigCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="5" :sm="24">
               <a-form-item label="产品名称">
                 <a-input id="inventoryQueryList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="仓库">
+                <warehouse isPermission v-model="queryParam.warehouseSn" id="inventoryQueryList-warehouseSn" placeholder="请选择仓库" />
+              </a-form-item>
+            </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="原厂编码">
+                  <a-input id="inventoryQueryList-productOrigCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="产品品牌">
                   <ProductBrand id="inventoryQueryList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
@@ -31,18 +36,13 @@
                   <ProductType id="inventoryQueryList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="仓库">
-                  <warehouse isPermission v-model="queryParam.warehouseSn" id="inventoryQueryList-warehouseSn" placeholder="请选择仓库" />
-                </a-form-item>
-              </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="库存情况">
                   <a-checkbox v-model="queryParam.zeroQtyFlag" id="inventoryQueryList-zeroQtyFlag">只查看有库存</a-checkbox>
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="7" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-button type="primary" @click="$refs.table.refresh()" :disabled="disabled" id="inventoryQueryList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryList-reset">重置</a-button>
               <a-button

+ 24 - 24
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -12,42 +12,42 @@
         <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-form-item label="变动类型">
-                  <v-select
-                    v-model="queryParam.flowType"
-                    ref="flowType"
-                    id="inventoryQueryWarehouseDetail-flowType"
-                    code="STOCK_FLOW_TYPE"
-                    placeholder="请选择变动类型"
-                    allowClear></v-select>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="单据审核时间">
+                  <rangeDate ref="rangeDate" @change="dateChange" />
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-item label="单据类型">
-                  <v-select
-                    v-model="queryParam.bizType"
-                    ref="bizType"
-                    id="inventoryQueryWarehouseDetail-bizType"
-                    code="STOCK_FLOW_BIZ_TYPE"
-                    placeholder="请选择单据类型"
-                    allowClear></v-select>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="关联单号">
+                  <a-input id="inventoryQueryWarehouseDetail-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入关联单号"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="单据审核时间">
-                  <rangeDate ref="rangeDate" @change="dateChange" />
+                <a-form-item label="下推单号">
+                  <a-input id="inventoryQueryWarehouseDetail-bizSubNo" v-model.trim="queryParam.bizSubNo" allowClear placeholder="请输入下推单号"/>
                 </a-form-item>
               </a-col>
               <template v-if="advanced">
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="关联单号">
-                    <a-input id="inventoryQueryWarehouseDetail-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入关联单号"/>
+                  <a-form-item label="变动类型">
+                    <v-select
+                      v-model="queryParam.flowType"
+                      ref="flowType"
+                      id="inventoryQueryWarehouseDetail-flowType"
+                      code="STOCK_FLOW_TYPE"
+                      placeholder="请选择变动类型"
+                      allowClear></v-select>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="下推单号">
-                    <a-input id="inventoryQueryWarehouseDetail-bizSubNo" v-model.trim="queryParam.bizSubNo" allowClear placeholder="请输入下推单号"/>
+                  <a-form-item label="单据类型">
+                    <v-select
+                      v-model="queryParam.bizType"
+                      ref="bizType"
+                      id="inventoryQueryWarehouseDetail-bizType"
+                      code="STOCK_FLOW_BIZ_TYPE"
+                      placeholder="请选择单据类型"
+                      allowClear></v-select>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">

+ 10 - 10
src/views/productManagement/newProduct/list.vue

@@ -5,6 +5,11 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" id="newProductList-form" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-model-item :label="($route.params.onlineFalg=='1'?'上':'下')+'线时间'">
+                <rangeDate id="newProductList-time" ref="rangeDate" :value="time" @change="dateChange" />
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="产品编码">
                 <a-input id="newProductList-code" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
@@ -15,12 +20,12 @@
                 <a-input id="newProductList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item :label="($route.params.onlineFalg=='1'?'上':'下')+'线时间'">
-                <rangeDate id="newProductList-time" ref="rangeDate" :value="time" @change="dateChange" />
-              </a-form-model-item>
-            </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="原厂编码">
+                  <a-input id="newProductList-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="产品品牌">
                   <ProductBrand id="newProductList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
@@ -31,11 +36,6 @@
                   <productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="productType" id="newProductList-productType"></productTypeAll>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="原厂编码">
-                  <a-input id="newProductList-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
-                </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="newProductList-refresh">查询</a-button>

+ 12 - 12
src/views/productManagement/priceChangeRecord/list.vue

@@ -11,17 +11,22 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="productChangeRecordList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="5" :sm="24">
               <a-form-item label="产品编码">
                 <a-input id="productChangeRecordList-code" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品名称">
+                <a-input id="productChangeRecordList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+              </a-form-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="7" :sm="24">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="变更状态">
+                  <v-select code="ENABLE_FLAG" id="productChangeRecordList-productStatus" v-model="queryParam.enabledFlag" allowClear placeholder="请选择变更状态"></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
                 <a-form-item label="品牌">
                   <ProductBrand id="productChangeRecordList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
                 </a-form-item>
@@ -31,13 +36,8 @@
                   <ProductType id="productChangeRecordList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="变更状态">
-                  <v-select code="ENABLE_FLAG" id="productChangeRecordList-productStatus" v-model="queryParam.enabledFlag" allowClear placeholder="请选择变更状态"></v-select>
-                </a-form-item>
-              </a-col>
             </template>
-            <a-col :md="7" :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)" :disabled="disabled" id="productChangeRecordList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productChangeRecordList-reset">重置</a-button>
               <a-button

+ 21 - 21
src/views/productManagement/productInfo/list.vue

@@ -6,8 +6,8 @@
         <a-form layout="inline" id="productInfoList-form" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="productInfoList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="最近修改时间">
+                <rangeDate id="productInfoList-rangeDate" ref="rangeDate" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -16,11 +16,16 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="品牌">
-                <ProductBrand id="productInfoList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+              <a-form-item label="产品名称">
+                <a-input id="productInfoList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="品牌">
+                  <ProductBrand id="productInfoList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="产品分类">
                   <productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="productType" id="productInfoList-productType"></productTypeAll>
@@ -36,23 +41,6 @@
                   <v-select code="PRICING_STATUS" id="productInfoList-pricingState" v-model="queryParam.pricingState" allowClear placeholder="请选择定价状态"></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="产品图片">
-                  <a-select id="productInfoList-picFlag" v-model="queryParam.picFlag" allowClear placeholder="请选择产品图片">
-                    <a-select-option value="1">
-                      有图片
-                    </a-select-option>
-                    <a-select-option value="0">
-                      无图片
-                    </a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="最近修改时间">
-                  <rangeDate id="productInfoList-rangeDate" ref="rangeDate" @change="dateChange" />
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="停产状态">
                   <a-select v-model="queryParam.haltProdFlag" id="productInfoList-haltProdFlag" placeholder="请选择停产状态" allowClear>
@@ -65,6 +53,18 @@
                   </a-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="是否有产品图片">
+                  <a-select id="productInfoList-picFlag" v-model="queryParam.picFlag" allowClear placeholder="请选择是否有产品图片">
+                    <a-select-option value="1">
+                      有图片
+                    </a-select-option>
+                    <a-select-option value="0">
+                      无图片
+                    </a-select-option>
+                  </a-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="productInfoList-refresh">查询</a-button>

+ 6 - 6
src/views/productManagement/productLaunchAudit/list.vue

@@ -5,9 +5,9 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" id="productLaunchAuditList-form" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
-            <a-col :md="5" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="productLaunchAuditList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="提交时间">
+                <rangeDate ref="rangeDate" id="productLaunchAuditList-rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="5" :sm="24">
@@ -15,9 +15,9 @@
                 <a-input id="productLaunchAuditList-code" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="提交时间">
-                <rangeDate ref="rangeDate" id="productLaunchAuditList-rangeDate" :value="time" @change="dateChange" />
+            <a-col :md="5" :sm="24">
+              <a-form-item label="产品名称">
+                <a-input id="productLaunchAuditList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24" v-if="queryParam.bizState == 'PASS'">

+ 8 - 8
src/views/productManagement/productLevel/list.vue

@@ -6,18 +6,18 @@
         <a-form layout="inline" id="productLevelList-form" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="productLevelList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="产品编码/原厂编码">
+                <a-input id="productLevelList-queryWord" v-model.trim="queryParam.queryWord" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码/原厂编码">
-                <a-input id="productLevelList-queryWord" v-model.trim="queryParam.queryWord" allowClear placeholder="请输入产品编码"/>
+              <a-form-item label="产品名称">
+                <a-input id="productLevelList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品分类">
-                <ProductType id="productLevelList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
+              <a-form-item label="产品级别">
+                <v-select code="PRODUCT_LEVEL" id="productLevelList-level" v-model="queryParam.level" allowClear placeholder="请选择产品级别"></v-select>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
@@ -27,8 +27,8 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="产品级别">
-                  <v-select code="PRODUCT_LEVEL" id="productLevelList-level" v-model="queryParam.level" allowClear placeholder="请选择产品级别"></v-select>
+                <a-form-item label="产品分类">
+                  <ProductType id="productLevelList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
                 </a-form-item>
               </a-col>
             </template>

+ 12 - 12
src/views/productManagement/productNotOnline/list.vue

@@ -6,8 +6,8 @@
         <a-form layout="inline" @keyup.enter.native="searchForm">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="productNotOnline-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="定价时间">
+                <rangeDate ref="rangeDate" id="productNotOnline-rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -16,29 +16,29 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="品牌">
-                <ProductBrand id="productNotOnline-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+              <a-form-item label="产品名称">
+                <a-input id="productNotOnline-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="产品分类">
-                  <ProductType id="productNotOnline-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
+                <a-form-item label="定价状态">
+                  <v-select code="PRICING_STATUS" id="productNotOnline-pricingState" v-model="queryParam.pricingState" allowClear placeholder="请选择定价状态"></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="定价时间">
-                  <rangeDate ref="rangeDate" id="productNotOnline-rangeDate" :value="time" @change="dateChange" />
+                <a-form-item label="产品状态">
+                  <v-select code="PRODUCT_STATUS" id="productNotOnline-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="定价状态">
-                  <v-select code="PRICING_STATUS" id="productNotOnline-pricingState" v-model="queryParam.pricingState" allowClear placeholder="请选择定价状态"></v-select>
+                <a-form-item label="品牌">
+                  <ProductBrand id="productNotOnline-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="产品状态">
-                  <v-select code="PRODUCT_STATUS" id="productNotOnline-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
+                <a-form-item label="产品分类">
+                  <ProductType id="productNotOnline-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
                 </a-form-item>
               </a-col>
             </template>

+ 15 - 15
src/views/productManagement/productOfflineAudit/list.vue

@@ -6,8 +6,8 @@
         <a-form layout="inline" id="productOfflineAuditList-form" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="productOfflineAuditList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="提交时间">
+                <rangeDate ref="rangeDate" id="productOfflineAuditList-rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -16,17 +16,22 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="下线选项">
-                <v-select
-                  v-model="queryParam.reasonType"
-                  ref="reasonType"
-                  id="productOfflineAuditList-reasonType"
-                  code="OFFLINE_REASON_TYPE"
-                  placeholder="请选择下线选项"
-                  allowClear></v-select>
+              <a-form-item label="产品名称">
+                <a-input id="productOfflineAuditList-name" v-model.trim="queryParam.name" 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.reasonType"
+                    ref="reasonType"
+                    id="productOfflineAuditList-reasonType"
+                    code="OFFLINE_REASON_TYPE"
+                    placeholder="请选择下线选项"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="品牌">
                   <ProductBrand id="productOfflineAuditList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
@@ -37,11 +42,6 @@
                   <productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="productType" id="productOfflineAuditList-productType"></productTypeAll>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="提交时间">
-                  <rangeDate ref="rangeDate" id="productOfflineAuditList-rangeDate" :value="time" @change="dateChange" />
-                </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="productOfflineAuditList-refresh">查询</a-button>

+ 10 - 10
src/views/productManagement/productPricing/list.vue

@@ -6,8 +6,8 @@
         <a-form layout="inline" @keyup.enter.native="searchForm">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="productPricingList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="定价时间">
+                <rangeDate id="productPricingList-rangeDate" ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -16,24 +16,24 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="品牌">
-                <ProductBrand id="productPricingList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+              <a-form-item label="产品名称">
+                <a-input id="productPricingList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="产品分类">
-                  <ProductType id="productPricingList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
+                <a-form-item label="定价状态">
+                  <v-select code="PRICING_STATUS" id="productPricingList-pricingState" v-model="queryParam.pricingState" allowClear placeholder="请选择定价状态"></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="定价时间">
-                  <rangeDate id="productPricingList-rangeDate" ref="rangeDate" :value="time" @change="dateChange" />
+                <a-form-item label="品牌">
+                  <ProductBrand id="productPricingList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="定价状态">
-                  <v-select code="PRICING_STATUS" id="productPricingList-pricingState" v-model="queryParam.pricingState" allowClear placeholder="请选择定价状态"></v-select>
+                <a-form-item label="产品分类">
+                  <ProductType id="productPricingList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
                 </a-form-item>
               </a-col>
             </template>

+ 6 - 6
src/views/productManagement/productUniversal/list.vue

@@ -16,19 +16,19 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品状态">
-                <v-select code="PRODUCT_STATUS" id="productUniversalList-productState" v-model="queryParam.productState" allowClear placeholder="请选择产品状态"></v-select>
+              <a-form-item label="通用产品编码">
+                <a-input id="productUniversalList-productCommonCode" v-model.trim="queryParam.productCommonCode" allowClear placeholder="请输入通用产品编码"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="通用产品编码">
-                  <a-input id="productUniversalList-productCommonCode" v-model.trim="queryParam.productCommonCode" allowClear placeholder="请输入通用产品编码"/>
+                <a-form-item label="通用产品名称">
+                  <a-input id="productUniversalList-productCommonName" v-model.trim="queryParam.productCommonName" allowClear placeholder="请输入通用产品名称"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="通用产品名称">
-                  <a-input id="productUniversalList-productCommonName" v-model.trim="queryParam.productCommonName" allowClear placeholder="请输入通用产品名称"/>
+                <a-form-item label="产品状态">
+                  <v-select code="PRODUCT_STATUS" id="productUniversalList-productState" v-model="queryParam.productState" allowClear placeholder="请选择产品状态"></v-select>
                 </a-form-item>
               </a-col>
             </template>

+ 9 - 9
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -11,8 +11,8 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="关联单号">
-                <a-input id="bulkWarehousingOrderList-relationNo" v-model.trim="queryParam.relationNo" allowClear placeholder="请输入关联单号"/>
+              <a-form-item label="商户名称">
+                <a-input id="bulkWarehousingOrderList-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入商户名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -21,16 +21,11 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="商户名称">
-                <a-input id="bulkWarehousingOrderList-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入商户名称"/>
+              <a-form-item label="关联单号">
+                <a-input id="bulkWarehousingOrderList-relationNo" v-model.trim="queryParam.relationNo" 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="6" :sm="24">
                 <a-form-item label="入库类型">
                   <v-select
@@ -52,6 +47,11 @@
                   />
                 </a-form-item>
               </a-col>
+              <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="6" :sm="24">
                 <a-form-item label="状态">
                   <v-select

+ 10 - 10
src/views/purchasingManagement/purchaseReceipt/list.vue

@@ -33,16 +33,6 @@
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户名称">
-                  <custList ref="custList" id="purchaseReceiptList-buyerSn" @change="custChange"></custList>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="关联单号">
-                  <a-input id="purchaseReceiptList-relationNo" v-model.trim="queryParam.relationNo" allowClear placeholder="请输入关联单号"/>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="业务状态">
                   <v-select
@@ -55,6 +45,16 @@
                   ></v-select>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="客户名称">
+                  <custList ref="custList" id="purchaseReceiptList-buyerSn" @change="custChange"></custList>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="关联单号">
+                  <a-input id="purchaseReceiptList-relationNo" v-model.trim="queryParam.relationNo" allowClear placeholder="请输入关联单号"/>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="供应商状态">
                   <v-select

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

@@ -11,13 +11,13 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="采购退货单号">
-                <a-input id="bulkWarehousingOrderList-productCode" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入采购退货单号"/>
+              <a-form-item label="供应商名称">
+                <supplier v-model="queryParam.supplierSn" isPermission placeholder="请输入供应商名称"></supplier>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="供应商名称">
-                <supplier v-model="queryParam.supplierSn" isPermission placeholder="请输入供应商名称"></supplier>
+              <a-form-item label="采购退货单号">
+                <a-input id="bulkWarehousingOrderList-productCode" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入采购退货单号"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">

+ 32 - 32
src/views/reportData/allocationDetails/list.vue

@@ -25,11 +25,36 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="品牌分类">
-                <v-select code="BRAND_TYPE" id="allocationDetailsList-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
+              <a-form-model-item label="调拨单号">
+                <a-input id="allocationDetailsList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="所在区域">
+                <subarea id="allocationDetailsList-subarea" ref="subarea" @change="subareaChange"></subarea>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="地区">
+                <Area id="allocationDetailsList-dealerProvinceSn" v-model="queryParam.dealerProvinceSn" placeholder="请选择省"></Area>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="客户名称">
+                <a-input id="allocationDetailsList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入客户名称"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="客户级别">
+                <v-select code="DEALER_LEVEL" id="allocationDetailsList-dealerLevel" v-model="queryParam.dealerLevel" allowClear placeholder="请选择客户级别"></v-select>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="品牌分类">
+                  <v-select code="BRAND_TYPE" id="allocationDetailsList-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="产品品牌">
                   <ProductBrand id="allocationDetailsList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
@@ -40,6 +65,11 @@
                   <a-input id="allocationDetailsList-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="产品分类">
+                  <ProductType id="allocationDetailsList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="费用/调拨类型">
                   <AllocateType id="allocationDetailsList-allocateTypeSn" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨类型" @change="changeAllocatype"></AllocateType>
@@ -52,41 +82,11 @@
                   </a-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="调拨单号">
-                  <a-input id="allocationDetailsList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品分类">
-                  <ProductType id="allocationDetailsList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="出库仓库">
                   <chooseWarehouse ref="warehouse" id="allocationDetailsList-warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户名称">
-                  <a-input id="allocationDetailsList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入客户名称"/>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户级别">
-                  <v-select code="DEALER_LEVEL" id="allocationDetailsList-dealerLevel" v-model="queryParam.dealerLevel" allowClear placeholder="请选择客户级别"></v-select>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="所在区域">
-                  <subarea id="allocationDetailsList-subarea" ref="subarea" @change="subareaChange"></subarea>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="地区">
-                  <Area id="allocationDetailsList-dealerProvinceSn" v-model="queryParam.dealerProvinceSn" placeholder="请选择省"></Area>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-model-item label="客服">
                   <customerService ref="customerName" id="allocationDetailsList-customerName" v-model="queryParam.bizUserSn"></customerService>

+ 12 - 12
src/views/reportData/allocationPresentation/list.vue

@@ -19,25 +19,25 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户名称">
-                  <a-input id="allocationPresentationList-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入客户名称"/>
+                <a-form-model-item label="调拨单号">
+                  <a-input id="allocationPresentationList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户级别">
-                  <v-select
-                    v-model="queryParam.dealer.dealerLevel"
-                    ref="dealerLevel"
-                    id="allocationPresentationList-dealerLevel"
-                    code="DEALER_LEVEL"
-                    placeholder="请选择客户级别"
-                    allowClear></v-select>
+                <a-form-model-item label="客户名称">
+                  <a-input id="allocationPresentationList-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入客户名称"/>
                 </a-form-model-item>
               </a-col>
               <template v-if="advanced">
                 <a-col :md="6" :sm="24">
-                  <a-form-model-item label="调拨单号">
-                    <a-input id="allocationPresentationList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
+                  <a-form-model-item label="客户级别">
+                    <v-select
+                      v-model="queryParam.dealer.dealerLevel"
+                      ref="dealerLevel"
+                      id="allocationPresentationList-dealerLevel"
+                      code="DEALER_LEVEL"
+                      placeholder="请选择客户级别"
+                      allowClear></v-select>
                   </a-form-model-item>
                 </a-col>
                 <a-col :md="6" :sm="24">

+ 2 - 2
src/views/reportData/hPriceDifferenceDetailReport/list.vue

@@ -18,8 +18,8 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="5" :sm="24">
-              <a-form-model-item label="单号">
-                <a-input id="hPriceDifferenceDetailList-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入单号"/>
+              <a-form-model-item label="单号">
+                <a-input id="hPriceDifferenceDetailList-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入单号"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">

+ 5 - 5
src/views/reportData/priceDifferenceDetailReport/list.vue

@@ -39,11 +39,6 @@
                 <dealerSubareaScopeList id="priceDifferenceDetailList-custList" ref="custList" :itemSn="queryParam.buyerSn" @change="custChange"></dealerSubareaScopeList>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
-              <a-form-model-item label="客服">
-                <customerService ref="customerName" id="priceDifferenceDetailList-customerName" v-model="queryParam.bizUserSn"></customerService>
-              </a-form-model-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="所在区域">
                 <subarea id="priceDifferenceDetailList-allocateTypeSn" placeholder="请选择区域" showLeve="1" ref="subarea" @change="subareaChange"></subarea>
@@ -60,6 +55,11 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
+              <a-form-model-item label="客服">
+                <customerService ref="customerName" id="priceDifferenceDetailList-customerName" v-model="queryParam.bizUserSn"></customerService>
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="priceDifferenceDetailList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="priceDifferenceDetailList-reset">重置</a-button>

+ 16 - 27
src/views/reportData/promotionSalesRealTimeReport/index.vue

@@ -18,23 +18,12 @@
                       <rangeDate ref="rangeDate" id="promotionSalesRealTimeReport-salesDate" :value="queryParam.salesDate" @change="salesDateChange" />
                     </a-form-model-item>
                   </a-col>
-                  <a-col :md="6" :sm="24">
-                    <a-form-model-item label="促销开始时间">
-                      <a-range-picker
-                        id="promotionSalesRealTimeReport-time"
-                        style="width:100%"
-                        v-model="time"
-                        :format="dateFormat"
-                        :placeholder="['开始时间', '结束时间']"
-                        @change="dateChange"></a-range-picker>
-                    </a-form-model-item>
-                  </a-col>
                   <a-col :md="6" :sm="24">
                     <a-form-model-item label="促销名称">
                       <a-input id="promotionSalesRealTimeReport-title" v-model.trim="queryParam.promoRuleReport.title" allowClear placeholder="请输入促销名称"/>
                     </a-form-model-item>
                   </a-col>
-                  <a-col :md="6" :sm="24" v-if="isShowCustomerSearch">
+                  <a-col :md="6" :sm="24">
                     <a-form-model-item label="促销类型">
                       <v-select
                         v-model="queryParam.promoRuleReport.promotionRuleType"
@@ -45,16 +34,21 @@
                         allowClear></v-select>
                     </a-form-model-item>
                   </a-col>
+                  <a-col :md="6" :sm="24">
+                    <a-form-model-item label="销售单号">
+                      <a-input id="promotionSalesRealTimeReport-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+                    </a-form-model-item>
+                  </a-col>
                   <template v-if="advanced">
-                    <a-col :md="6" :sm="24" v-if="!isShowCustomerSearch">
-                      <a-form-model-item label="促销类型">
-                        <v-select
-                          v-model="queryParam.promoRuleReport.promotionRuleType"
-                          ref="ruleType"
-                          id="promotionSalesRealTimeReport-ruleType"
-                          code="PROMOTION_RULE_TYPE"
-                          placeholder="请选择促销类型"
-                          allowClear></v-select>
+                    <a-col :md="6" :sm="24">
+                      <a-form-model-item label="促销开始时间">
+                        <a-range-picker
+                          id="promotionSalesRealTimeReport-time"
+                          style="width:100%"
+                          v-model="time"
+                          :format="dateFormat"
+                          :placeholder="['开始时间', '结束时间']"
+                          @change="dateChange"></a-range-picker>
                       </a-form-model-item>
                     </a-col>
                     <a-col :md="6" :sm="24">
@@ -62,11 +56,6 @@
                         <a-input id="promotionSalesRealTimeReport-ruleInfo" v-model.trim="queryParam.promoRuleReport.ruleInfo" allowClear placeholder="请输入规则关键字"/>
                       </a-form-model-item>
                     </a-col>
-                    <a-col :md="6" :sm="24">
-                      <a-form-model-item label="销售单号">
-                        <a-input id="promotionSalesRealTimeReport-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
-                      </a-form-model-item>
-                    </a-col>
                     <a-col :md="6" :sm="24">
                       <a-form-model-item label="客户级别">
                         <v-select
@@ -110,7 +99,7 @@
                       </a-form-model-item>
                     </a-col>
                   </template>
-                  <a-col :md="isShowCustomerSearch?24:6" :sm="24" :style="{textAlign: isShowCustomerSearch?'center':''}">
+                  <a-col :md="24" :sm="24" style="text-align:center">
                     <div class="table-page-search-submitButtons">
                       <a-button type="primary" id="promotionSalesRealTimeReport-refresh" :disabled="disabled" @click="testForm('search')" >查询</a-button>
                       <a-button style="margin-left: 8px" id="promotionSalesRealTimeReport-reset" :disabled="disabled" @click="resetSearchForm">重置</a-button>

+ 30 - 30
src/views/reportData/promotionSalesRealTimeReport/list.vue

@@ -1,7 +1,7 @@
 <template>
   <a-spin :spinning="spinning" tip="Loading...">
     <div class="productInfoList-wrap">
-      <a-card size="small" :bordered="false" class="searchBoxNormal">
+      <a-card size="small" :bordered="false" class="promotionSalesRealTimeReport-wrap searchBox">
         <!-- 查询 -->
         <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
           <a-form-model id="promotionSalesRealTimeList-form" layout="inline" ref="ruleForm" :rules="rules" :model="newQueryParam">
@@ -11,17 +11,6 @@
                   <rangeDate id="promotionSalesRealTimeList-salesDate" ref="rangeDate" :value="newQueryParam.salesDate" @change="salesDateChange" />
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="促销开始时间">
-                  <a-range-picker
-                    style="width:100%"
-                    v-model="time"
-                    :format="dateFormat"
-                    id="promotionSalesRealTimeList-time"
-                    :placeholder="['开始时间', '结束时间']"
-                    @change="dateChange"></a-range-picker>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="促销名称">
                   <a-input
@@ -31,16 +20,36 @@
                     placeholder="请输入促销名称" />
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="促销类型">
+                  <v-select
+                    v-model="newQueryParam.promoRuleReport.promotionRuleType"
+                    ref="ruleType"
+                    id="promotionSalesRealTimeList-ruleType"
+                    code="PROMOTION_RULE_TYPE"
+                    placeholder="请选择促销类型"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="销售单号">
+                  <a-input
+                    id="promotionSalesRealTimeList-salesBillNo"
+                    v-model.trim="newQueryParam.salesBillNo"
+                    allowClear
+                    placeholder="请输入销售单号" />
+                </a-form-model-item>
+              </a-col>
               <template v-if="advanced">
                 <a-col :md="6" :sm="24">
-                  <a-form-model-item label="促销类型">
-                    <v-select
-                      v-model="newQueryParam.promoRuleReport.promotionRuleType"
-                      ref="ruleType"
-                      id="promotionSalesRealTimeList-ruleType"
-                      code="PROMOTION_RULE_TYPE"
-                      placeholder="请选择促销类型"
-                      allowClear></v-select>
+                  <a-form-model-item label="促销开始时间">
+                    <a-range-picker
+                      style="width:100%"
+                      v-model="time"
+                      :format="dateFormat"
+                      id="promotionSalesRealTimeList-time"
+                      :placeholder="['开始时间', '结束时间']"
+                      @change="dateChange"></a-range-picker>
                   </a-form-model-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
@@ -52,15 +61,6 @@
                       placeholder="请输入规则关键字" />
                   </a-form-model-item>
                 </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-model-item label="销售单号">
-                    <a-input
-                      id="promotionSalesRealTimeList-salesBillNo"
-                      v-model.trim="newQueryParam.salesBillNo"
-                      allowClear
-                      placeholder="请输入销售单号" />
-                  </a-form-model-item>
-                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-model-item label="客户级别">
                     <v-select
@@ -97,7 +97,7 @@
                   </a-form-model-item>
                 </a-col>
               </template>
-              <a-col :md="6" :sm="24">
+              <a-col :md="24" :sm="24" style="text-align:center">
                 <span class="table-page-search-submitButtons">
                   <a-button type="primary" id="promotionSalesRealTimeList-refresh":disabled="disabled" @click="testForm('search')">查询</a-button>
                   <a-button style="margin-left: 8px" id="promotionSalesRealTimeList-reset" :disabled="disabled" @click="resetSearchForm">重置</a-button>

+ 12 - 12
src/views/reportData/returnGoodsPresentation/list.vue

@@ -18,26 +18,26 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户名称">
-                <dealerSubareaScopeList id="returnGoodsPresentationList-dealerSn" ref="custList" @change="custChange"></dealerSubareaScopeList>
+              <a-form-model-item label="退货单号">
+                <a-input id="returnGoodsPresentationList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户级别">
-                <v-select
-                  v-model="queryParam.dealer.dealerLevel"
-                  ref="dealerLevel"
-                  id="returnGoodsPresentationList-dealerLevel"
-                  code="DEALER_LEVEL"
-                  placeholder="请选择客户级别"
-                  allowClear></v-select>
+              <a-form-model-item label="客户名称">
+                <dealerSubareaScopeList id="returnGoodsPresentationList-dealerSn" ref="custList" @change="custChange"></dealerSubareaScopeList>
               </a-form-model-item>
             </a-col>
 
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="退货单号">
-                  <a-input id="returnGoodsPresentationList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
+                <a-form-model-item label="客户级别">
+                  <v-select
+                    v-model="queryParam.dealer.dealerLevel"
+                    ref="dealerLevel"
+                    id="returnGoodsPresentationList-dealerLevel"
+                    code="DEALER_LEVEL"
+                    placeholder="请选择客户级别"
+                    allowClear></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">

+ 12 - 13
src/views/reportData/returnSlipReport/list.vue

@@ -18,26 +18,25 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户名称">
-                <dealerSubareaScopeList id="returnSlipReportList-custList" ref="custList" @change="custChange"></dealerSubareaScopeList>
+              <a-form-model-item label="退货单号">
+                <a-input id="returnSlipReportList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户级别">
-                <v-select
-                  v-model="queryParam.dealerLevel"
-                  ref="dealerLevel"
-                  id="returnSlipReportList-dealerLevel"
-                  code="DEALER_LEVEL"
-                  placeholder="请选择客户级别"
-                  allowClear></v-select>
+              <a-form-model-item label="客户名称">
+                <dealerSubareaScopeList id="returnSlipReportList-custList" ref="custList" @change="custChange"></dealerSubareaScopeList>
               </a-form-model-item>
             </a-col>
-
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="退货单号">
-                  <a-input id="returnSlipReportList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
+                <a-form-model-item label="客户级别">
+                  <v-select
+                    v-model="queryParam.dealerLevel"
+                    ref="dealerLevel"
+                    id="returnSlipReportList-dealerLevel"
+                    code="DEALER_LEVEL"
+                    placeholder="请选择客户级别"
+                    allowClear></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">

+ 42 - 42
src/views/reportData/salesDetails/list.vue

@@ -18,28 +18,28 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="销售单号">
-                <a-input id="salesDetailsList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+              <a-form-model-item label="产品编码">
+                <a-input id="salesDetailsList-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="备货单号">
-                <a-input id="salesDetailsList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+              <a-form-model-item label="客户名称">
+                <a-input id="salesDetailsList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入客户名称"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="产品编码">
-                <a-input id="salesDetailsList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+              <a-form-model-item label="销售单号">
+                <a-input id="salesDetailsList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="产品名称">
-                <a-input id="salesDetailsList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+              <a-form-model-item label="出库仓库">
+                <chooseWarehouse id="salesDetailsList-warehouseSn" ref="warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户名称">
-                <a-input id="salesDetailsList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入客户名称"/>
+              <a-form-model-item label="产品名称">
+                <a-input id="salesDetailsList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -53,6 +53,11 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="备货单号">
+                <a-input id="salesDetailsList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24" v-if="!isShowCustomerSearch">
                 <a-form-model-item label="品牌分类">
@@ -69,38 +74,6 @@
                   <ProductType id="salesDetailsList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="出库仓库">
-                  <chooseWarehouse id="salesDetailsList-warehouseSn" ref="warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="所在区域">
-                  <subarea id="salesDetailsList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="区域负责人">
-                  <BizUser id="salesDetailsList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="地区">
-                  <AreaList id="salesDetailsList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="促销产品">
-                  <a-select id="salesDetailsList-giftFlag" v-model="queryParam.giftFLag" placeholder="请选择促销产品" allowClear>
-                    <a-select-option value="1">
-                      是
-                    </a-select-option>
-                    <a-select-option value="0">
-                      否
-                    </a-select-option>
-                  </a-select>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="产品类型" prop="promotionFlag">
                   <a-select id="salesDetailsList-promotionFlag" allowClear v-model.trim="queryParam.promotionFlag" :dropdownMatchSelectWidth="false" placeholder="请选择产品类型">
@@ -122,6 +95,33 @@
                   </a-select>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="是否促销产品">
+                  <a-select id="salesDetailsList-giftFlag" v-model="queryParam.giftFLag" placeholder="请选择是否促销产品" allowClear>
+                    <a-select-option value="1">
+                      是
+                    </a-select-option>
+                    <a-select-option value="0">
+                      否
+                    </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="所在区域">
+                  <subarea id="salesDetailsList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="区域负责人">
+                  <BizUser id="salesDetailsList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="地区">
+                  <AreaList id="salesDetailsList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-model-item label="客服">
                   <customerService id="salesDetailsList-customerName" ref="customerName" v-model="queryParam.bizUserSn"></customerService>

+ 12 - 12
src/views/reportData/salesPresentation/list.vue

@@ -18,26 +18,26 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户名称">
-                <dealerSubareaScopeList id="salesPresentationList-dealerSn" ref="custList" @change="custChange"></dealerSubareaScopeList>
+              <a-form-model-item label="销售单号">
+                <a-input id="salesPresentationList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户级别">
-                <v-select
-                  v-model="queryParam.dealer.dealerLevel"
-                  ref="dealerLevel"
-                  id="salesPresentationList-dealerLevel"
-                  code="DEALER_LEVEL"
-                  placeholder="请选择客户级别"
-                  allowClear></v-select>
+              <a-form-model-item label="客户名称">
+                <dealerSubareaScopeList id="salesPresentationList-dealerSn" ref="custList" @change="custChange"></dealerSubareaScopeList>
               </a-form-model-item>
             </a-col>
 
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="销售单号">
-                  <a-input id="salesPresentationList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+                <a-form-model-item label="客户级别">
+                  <v-select
+                    v-model="queryParam.dealer.dealerLevel"
+                    ref="dealerLevel"
+                    id="salesPresentationList-dealerLevel"
+                    code="DEALER_LEVEL"
+                    placeholder="请选择客户级别"
+                    allowClear></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">

+ 4 - 4
src/views/reportData/salesReturnDetailReport/list.vue

@@ -18,13 +18,13 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="退货单号">
-                <a-input id="salesReturnDetailList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
+              <a-form-model-item label="产品编码">
+                <a-input id="salesReturnDetailList-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="产品编码">
-                <a-input id="salesReturnDetailList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+              <a-form-model-item label="退货单号">
+                <a-input id="salesReturnDetailList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24" v-if="isShowCustomerSearch">

+ 28 - 34
src/views/reportData/salesReturnsReport/list.vue

@@ -12,28 +12,23 @@
           :rules="rules"
           @keyup.enter.native="handleSearch">
           <a-row :gutter="15">
-            <a-col :md="7" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="退货完成日期" prop="time">
                 <rangeDate ref="rangeDate" id="salesReturnsReportList-time" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="退货单号">
                 <a-input id="salesReturnsReportList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="5" :sm="24">
-              <a-form-model-item label="所在区域">
-                <subarea id="salesReturnsReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="客户名称">
+                <dealerSubareaScopeList ref="custList" id="salesReturnsReportList-dealerSn" @change="custChange" />
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="7" :sm="24">
-                <a-form-model-item label="客户名称">
-                  <dealerSubareaScopeList ref="custList" id="salesReturnsReportList-dealerSn" @change="custChange" />
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="7" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户级别">
                   <v-select
                     v-model="queryParam.dealerLevel"
@@ -44,12 +39,18 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="5" :sm="24">
-                <a-form-model-item label="地区">
-                  <AreaList id="salesReturnsReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="退货类别" prop="goodFlag">
+                  <v-select
+                    v-model="queryParam.goodFlag"
+                    ref="goodFlag"
+                    id="salesReturnsReportList-goodFlag"
+                    code="GOOD_FLAG"
+                    placeholder="请选择退货类别"
+                    allowClear></v-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="5" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-model-item label="退货类型">
                   <v-select
                     v-model="queryParam.salesReturnType"
@@ -59,35 +60,28 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="7" :sm="24">
-                <a-form-model-item label="退货仓库">
-                  <chooseWarehouse id="salesReturnsReportList-warehouse" ref="warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="所在区域">
+                  <subarea id="salesReturnsReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="7" :sm="24">
-                <a-form-model-item label="退货类别" prop="goodFlag">
-                  <v-select
-                    v-model="queryParam.goodFlag"
-                    ref="goodFlag"
-                    id="salesReturnsReportList-goodFlag"
-                    code="GOOD_FLAG"
-                    placeholder="请选择退货类别"
-                    allowClear></v-select>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="地区">
+                  <AreaList id="salesReturnsReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="5" :sm="24" v-show="isShowCustomerSearch">
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="退货仓库">
+                  <chooseWarehouse id="salesReturnsReportList-warehouse" ref="warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-model-item label="客服">
                   <customerService id="salesReturnsReportList-customerName" ref="customerName" v-model="queryParam.bizUserSn"></customerService>
                 </a-form-model-item>
               </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-              <!-- <a-button
-                type="primary"
-                class="button-info"
-                size="small"
-                @click="handleStock"
-                id="salesReturnsReportList-stockDate">盘点区间日期</a-button> -->
               <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnsReportList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesReturnsReportList-reset">重置</a-button>
               <a-button

+ 6 - 6
src/views/reportData/tireFeeReport/monthQueryList.vue

@@ -38,11 +38,6 @@
                   <dealerSubareaScopeList ref="dealerSubareaScopeList" id="monthQueryList-dealerName" @change="custChange" />
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="轮胎省仓名称">
-                  <dealerSubareaScopeList ref="provinceDealerList" placeholder="请输入轮胎省仓名称" id="monthQueryList-provinceDealerName" @change="custProvinceChange" />
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户级别">
                   <v-select
@@ -55,7 +50,7 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="轮胎省仓">
+                <a-form-model-item label="是否轮胎省仓">
                   <v-select
                     v-model="queryParam.provinceFlag"
                     ref="provinceFlag"
@@ -65,6 +60,11 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="轮胎省仓名称">
+                  <dealerSubareaScopeList ref="provinceDealerList" placeholder="请输入轮胎省仓名称" id="monthQueryList-provinceDealerName" @change="custProvinceChange" />
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24">
               <a-button

+ 22 - 22
src/views/reportData/tireSalesReport/detailList.vue

@@ -22,6 +22,16 @@
                   @change="dateChange" />
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="产品编码/原厂编码">
+                <a-input id="tireSalesReportList-productWord" v-model.trim="queryParam.productWord" allowClear placeholder="请输入产品编码/原厂编码"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="产品名称">
+                <a-input id="tireSalesReportList-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="地区">
                 <AreaList id="tireSalesReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
@@ -32,12 +42,17 @@
                 <subarea id="tireSalesReportList-subarea" ref="subarea" @change="subareaChange"></subarea>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="区域负责人">
+                <BizUser id="tireSalesReportList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="客户名称">
+                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="tireSalesReportList-dealerName" @change="custChange" />
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户名称">
-                  <dealerSubareaScopeList ref="dealerSubareaScopeList" id="tireSalesReportList-dealerName" @change="custChange" />
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户级别">
                   <v-select
@@ -50,12 +65,12 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="轮胎省仓">
+                <a-form-model-item label="是否轮胎省仓">
                   <v-select
                     v-model="queryParam.provinceFlag"
                     id="tireSalesDealerList-provinceFlag"
                     code="Flag"
-                    placeholder="请选择是否轮胎省仓"
+                    placeholder="请选择是否轮胎省仓"
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
@@ -64,26 +79,11 @@
                   <dealerSubareaScopeList ref="provinceDealerList" placeholder="请输入轮胎省仓名称" id="tireSalesDealerList-parentDealerName" @change="custProvinceChange" />
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="区域负责人">
-                  <BizUser id="tireSalesReportList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-model-item label="客服">
                   <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品编码/原厂编码">
-                  <a-input id="tireSalesReportList-productWord" v-model.trim="queryParam.productWord" allowClear placeholder="请输入产品编码/原厂编码"/>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品名称">
-                  <a-input id="tireSalesReportList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
-                </a-form-model-item>
-              </a-col>
             </template>
             <a-col :md="6" :sm="24">
               <a-button

+ 7 - 7
src/views/reportData/tireSalesReport/list.vue

@@ -33,6 +33,11 @@
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="区域负责人">
+                  <BizUser id="tireSalesDealerList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户名称">
                   <dealerSubareaScopeList ref="dealerSubareaScopeList" id="tireSalesDealerList-dealerName" @change="custChange" />
@@ -50,12 +55,12 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="轮胎省仓">
+                <a-form-model-item label="是否轮胎省仓">
                   <v-select
                     v-model="queryParam.provinceFlag"
                     id="tireSalesDealerList-provinceFlag"
                     code="Flag"
-                    placeholder="请选择是否轮胎省仓"
+                    placeholder="请选择是否轮胎省仓"
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
@@ -64,11 +69,6 @@
                   <dealerSubareaScopeList ref="provinceDealerList" placeholder="请输入轮胎省仓名称" id="tireSalesDealerList-parentDealerName" @change="custProvinceChange" />
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="区域负责人">
-                  <BizUser id="tireSalesDealerList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-model-item label="客服">
                   <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>

+ 13 - 13
src/views/reportData/transferReturnDetailReport/list.vue

@@ -17,6 +17,11 @@
                 <rangeDate ref="rangeDate" id="transferReturnDetailReport-time" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="产品编码">
+                <a-input id="transferReturnDetailReport-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="调拨退货单号">
                 <a-input id="transferReturnDetailReport-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo" allowClear placeholder="请输入调拨退货单号"/>
@@ -52,30 +57,25 @@
                 <Area id="transferReturnDetailReport-provinceSn" defValKey="id" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="产品品牌">
-                <ProductBrand id="transferReturnDetailReport-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
-              </a-form-model-item>
-            </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="品牌分类">
-                  <v-select code="BRAND_TYPE" id="transferReturnDetailReport-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
+                <a-form-model-item label="产品名称">
+                  <a-input id="transferReturnDetailReport-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="品分类">
-                  <ProductType id="transferReturnDetailReport-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
+                <a-form-model-item label="品分类">
+                  <v-select code="BRAND_TYPE" id="transferReturnDetailReport-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品名称">
-                  <a-input id="transferReturnDetailReport-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+                <a-form-model-item label="产品品牌">
+                  <ProductBrand id="transferReturnDetailReport-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品编码">
-                  <a-input id="transferReturnDetailReport-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+                <a-form-model-item label="产品分类">
+                  <ProductType id="transferReturnDetailReport-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
                 </a-form-model-item>
               </a-col>
             </template>

+ 10 - 10
src/views/reportData/urchaseDetailReturn/detailList.vue

@@ -17,17 +17,22 @@
                 <rangeDate ref="rangeDate" id="urchaseDetailReturn-time" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="产品编码">
+                <a-input id="urchaseDetailReturn-productCode" v-model.trim="queryParam.product.code" allowClear placeholder="请输入产品编码"/>
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="采购退货单号">
                 <a-input id="urchaseDetailReturn-sparePartsReturnNo" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入采购退货单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="供应商名称">
-                <supplier id="urchaseDetailReturn-supplierSn" isPermission v-model="queryParam.supplier.supplierSn" @change="getSupplierName" placeholder="请输入供应商名称"></supplier>
-              </a-form-model-item>
-            </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="供应商名称">
+                  <supplier id="urchaseDetailReturn-supplierSn" isPermission v-model="queryParam.supplier.supplierSn" @change="getSupplierName" placeholder="请输入供应商名称"></supplier>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="退货原因">
                   <v-select
@@ -39,11 +44,6 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品编码">
-                  <a-input id="urchaseDetailReturn-productCode" v-model.trim="queryParam.product.code" allowClear placeholder="请输入产品编码"/>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="产品名称">
                   <a-input id="urchaseDetailReturn-productName" v-model.trim="queryParam.product.name" allowClear placeholder="请输入产品名称"/>

+ 26 - 26
src/views/reportData/warehousingOrderDetail/list.vue

@@ -18,51 +18,51 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="入库单号">
-                <a-input id="warehousingOrderDetailList-stockPutNo" v-model.trim="queryParam.stockPutNo" allowClear placeholder="请输入入库单号"/>
+              <a-form-model-item label="产品编码">
+                <a-input id="warehousingOrderDetailList-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.putBizType"
-                  ref="putBizType"
-                  id="warehousingOrderDetailList-putBizType"
-                  code="PUT_STOCK_TYPE_REPORT"
-                  placeholder="请选择入库类型"
-                  allowClear></v-select>
+              <a-form-model-item label="入库单号">
+                <a-input id="warehousingOrderDetailList-stockPutNo" v-model.trim="queryParam.stockPutNo" allowClear placeholder="请输入入库单号"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="散件入库子类型">
-                <v-select
-                  v-model="queryParam.sparePartsType"
-                  ref="sparePartsType"
-                  id="warehousingOrderDetailList-sparePartsType"
-                  code="SPARE_PARTS_TYPE"
-                  placeholder="请选择散件入库子类型"
-                  allowClear></v-select>
+              <a-form-model-item label="单位名称">
+                <a-input id="warehousingOrderDetailList-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入单位名称"/>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="入库仓库">
-                  <chooseWarehouse ref="warehouse" id="warehousingOrderDetailList-warehouseSn" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
+                <a-form-model-item label="产品名称">
+                  <a-input id="warehousingOrderDetailList-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="单位名称">
-                  <a-input id="warehousingOrderDetailList-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入单位名称"/>
+                <a-form-model-item label="入库类型">
+                  <v-select
+                    v-model="queryParam.putBizType"
+                    ref="putBizType"
+                    id="warehousingOrderDetailList-putBizType"
+                    code="PUT_STOCK_TYPE_REPORT"
+                    placeholder="请选择入库类型"
+                    allowClear></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品名称">
-                  <a-input id="warehousingOrderDetailList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+                <a-form-model-item label="散件入库子类型">
+                  <v-select
+                    v-model="queryParam.sparePartsType"
+                    ref="sparePartsType"
+                    id="warehousingOrderDetailList-sparePartsType"
+                    code="SPARE_PARTS_TYPE"
+                    placeholder="请选择散件入库子类型"
+                    allowClear></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品编码">
-                  <a-input id="warehousingOrderDetailList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+                <a-form-model-item label="入库仓库">
+                  <chooseWarehouse ref="warehouse" id="warehousingOrderDetailList-warehouseSn" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
             </template>

+ 12 - 12
src/views/salesManagement/examineVerify/list.vue

@@ -22,19 +22,13 @@
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="出库单号">
-                  <a-input id="examineVerifyList-stockOutNo" v-model.trim="queryParam.stockOutNo" allowClear placeholder="请输入出库单号"/>
+                <a-form-item label="备货单号">
+                  <a-input id="examineVerifyList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="打印状态">
-                  <v-select
-                    v-model="queryParam.printStatus"
-                    ref="printStatus"
-                    id="examineVerifyList-printStatus"
-                    code="PRINT_STATUS"
-                    placeholder="请选择打印状态"
-                    allowClear></v-select>
+                <a-form-item label="出库单号">
+                  <a-input id="examineVerifyList-stockOutNo" v-model.trim="queryParam.stockOutNo" allowClear placeholder="请输入出库单号"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -49,8 +43,14 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="备货单号">
-                  <a-input id="examineVerifyList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+                <a-form-item label="打印状态">
+                  <v-select
+                    v-model="queryParam.printStatus"
+                    ref="printStatus"
+                    id="examineVerifyList-printStatus"
+                    code="PRINT_STATUS"
+                    placeholder="请选择打印状态"
+                    allowClear></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">

+ 26 - 26
src/views/salesManagement/matchSendOutOrder/list.vue

@@ -21,25 +21,30 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="备货单号">
-                <a-input id="matchSoo-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  id="matchSoo-billStatus"
+                  code="DISPATCH_BILL_STATUS"
+                  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="checkDate" :value="checktime" @change="checkDateChange" />
+                </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="shbuyerName" id="matchSoo-shbuyerName" @change="shcustChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="业务状态">
-                  <v-select
-                    v-model="queryParam.billStatus"
-                    ref="billStatus"
-                    id="matchSoo-billStatus"
-                    code="DISPATCH_BILL_STATUS"
-                    placeholder="请选择业务状态"
-                    allowClear></v-select>
+                <a-form-item label="备货单号">
+                  <a-input id="matchSoo-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -53,22 +58,6 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="对单状态">
-                  <v-select
-                    v-model="queryParam.checkStatus"
-                    ref="checkStatus"
-                    id="matchSoo-checkStatus"
-                    code="CHECK_STATUS"
-                    placeholder="请选择对单状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="对单时间">
-                  <rangeDate ref="checkDate" :value="checktime" @change="checkDateChange" />
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="matchSoo-subarea" ref="subarea" @change="subareaChange"></subarea>
@@ -84,6 +73,17 @@
                   <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="对单状态">
+                  <v-select
+                    v-model="queryParam.checkStatus"
+                    ref="checkStatus"
+                    id="matchSoo-checkStatus"
+                    code="CHECK_STATUS"
+                    placeholder="请选择对单状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-item label="客服">
                   <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>

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

@@ -16,17 +16,32 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="出库类型">
-                <v-select
-                  v-model="queryParam.outBizType"
-                  ref="outBizType"
-                  id="outboundOrderList-outBizType"
-                  code="OUT_STOCK_TYPE"
-                  placeholder="请选择出库类型"
-                  allowClear></v-select>
+              <a-form-item label="出库单号">
+                <a-input id="outboundOrderList-stockOutNo" v-model.trim="queryParam.stockOutNo" allowClear placeholder="请输入出库单号"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="业务单号">
+                  <a-input id="outboundOrderList-outBizNo" v-model.trim="queryParam.outBizNo" allowClear placeholder="请输入业务单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="备货单号">
+                  <a-input id="outboundOrderList-outBizSubNo" v-model.trim="queryParam.outBizSubNo" allowClear placeholder="请输入备货单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="出库类型">
+                  <v-select
+                    v-model="queryParam.outBizType"
+                    ref="outBizType"
+                    id="outboundOrderList-outBizType"
+                    code="OUT_STOCK_TYPE"
+                    placeholder="请选择出库类型"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="出库状态">
                   <v-select
@@ -49,21 +64,6 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="业务单号">
-                  <a-input id="outboundOrderList-outBizNo" v-model.trim="queryParam.outBizNo" allowClear placeholder="请输入业务单号"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="出库单号">
-                  <a-input id="outboundOrderList-stockOutNo" v-model.trim="queryParam.stockOutNo" allowClear placeholder="请输入出库单号"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="备货单号">
-                  <a-input id="outboundOrderList-outBizSubNo" v-model.trim="queryParam.outBizSubNo" allowClear placeholder="请输入备货单号"/>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="outboundOrderList-subarea" ref="subarea" @change="subareaChange"></subarea>

+ 16 - 16
src/views/salesManagement/pushOrderManagement/list.vue

@@ -25,23 +25,23 @@
                 <a-input id="pushOrder-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
               </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="shbuyerName" id="pushOrder-shbuyerName" @change="shcustChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  id="pushOrder-billStatus"
+                  code="DISPATCH_BILL_STATUS"
+                  placeholder="请选择业务状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="收货客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                  <dealerSubareaScopeList ref="shbuyerName" id="pushOrder-shbuyerName" @change="shcustChange" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="业务状态">
-                  <v-select
-                    v-model="queryParam.billStatus"
-                    ref="billStatus"
-                    id="pushOrder-billStatus"
-                    code="DISPATCH_BILL_STATUS"
-                    placeholder="请选择业务状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="单据状态">
                   <v-select

+ 38 - 38
src/views/salesManagement/salesCollection/list.vue

@@ -20,33 +20,44 @@
                 <a-input id="salesCollectionList-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入销售单号"/>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  id="salesCollectionList-billStatus"
+                  code="DISPATCH_BILL_STATUS"
+                  placeholder="请选择业务状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="收款时间">
+                <rangeDate ref="rangeSettleDate" :value="settleDate" @change="dateSettleChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="收货客户名称">
+                <dealerSubareaScopeList ref="receiverName" id="salesCollectionList-receiverName" @change="receiverChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="备货单号">
+                <a-input id="salesCollectionList-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="备货单号">
-                  <a-input id="salesCollectionList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="收货客户名称">
-                  <dealerSubareaScopeList ref="receiverName" id="salesCollectionList-receiverName" @change="receiverChange" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="收款类型">
+                <a-form-item label="单据状态">
                   <v-select
-                    v-model="queryParam.keepType"
-                    ref="keepType"
-                    id="salesCollectionList-keepType"
-                    code="KEEP_TYPE"
-                    placeholder="请选择收款类型"
+                    v-model="queryParam.voidFlag"
+                    ref="voidFlag"
+                    id="salesCollectionList-voidFlag"
+                    code="VOID_FLAG"
+                    placeholder="请选择单据状态"
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="收款时间">
-                  <rangeDate ref="rangeSettleDate" :value="settleDate" @change="dateSettleChange" />
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="收款方式">
                   <v-select
@@ -58,17 +69,6 @@
                     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="salesCollectionList-billStatus"
-                    code="DISPATCH_BILL_STATUS"
-                    placeholder="请选择业务状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="财务状态">
                   <v-select
@@ -81,13 +81,13 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="单据状态">
+                <a-form-item label="收款类型">
                   <v-select
-                    v-model="queryParam.voidFlag"
-                    ref="voidFlag"
-                    id="salesCollectionList-voidFlag"
-                    code="VOID_FLAG"
-                    placeholder="请选择单据状态"
+                    v-model="queryParam.keepType"
+                    ref="keepType"
+                    id="salesCollectionList-keepType"
+                    code="KEEP_TYPE"
+                    placeholder="请选择收款类型"
                     allowClear></v-select>
                 </a-form-item>
               </a-col>

+ 31 - 31
src/views/salesManagement/salesList/list.vue

@@ -18,30 +18,23 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="销售单号">
-                <a-input id="salesList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+              <a-form-model-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesList-buyerName" @change="custChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="所属区域/分区">
-                <subarea id="salesList-subarea" ref="subarea" @change="subareaChange"></subarea>
+              <a-form-model-item label="销售单号">
+                <a-input id="salesList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </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="salesList-buyerName" @change="custChange" />
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="财务状态">
-                  <v-select
-                    v-model="queryParam.financialStatus"
-                    ref="financialStatus"
-                    id="salesList-financialStatus"
-                    code="FINANCIAL_RECEIVE_STATUS"
-                    placeholder="请选择财务状态"
-                    allowClear></v-select>
+                <a-form-model-item label="超时环节提醒">
+                  <a-select v-model="queryParam.timeoutflag" allowClear placeholder="请选择超时环节提醒状态">
+                    <a-select-option value="NOT_SENDGOODS">未发货</a-select-option>
+                    <a-select-option value="NOT_STOCK">未备货</a-select-option>
+                    <a-select-option value="NOT_COLLECTION">未收款</a-select-option>
+                  </a-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -49,11 +42,6 @@
                   <rangeDate ref="processRangeDate" :value="examineTime" @change="processDateChange" />
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="收款时间">
-                  <rangeDate ref="collectionRangeDate" :value="paymentTime" @change="collectionDateChange" />
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="业务状态">
                   <v-select
@@ -77,21 +65,28 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="省份" prop="provinceSn">
-                  <Area id="salesList-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
+                <a-form-model-item label="所属区域/分区">
+                  <subarea id="salesList-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="超时环节提醒">
-                  <a-select v-model="queryParam.timeoutflag" allowClear placeholder="请选择超时环节提醒状态">
-                    <a-select-option value="NOT_SENDGOODS">未发货</a-select-option>
-                    <a-select-option value="NOT_STOCK">未备货</a-select-option>
-                    <a-select-option value="NOT_COLLECTION">未收款</a-select-option>
-                  </a-select>
+                <a-form-model-item label="收款时间">
+                  <rangeDate ref="collectionRangeDate" :value="paymentTime" @change="collectionDateChange" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="财务状态">
+                  <v-select
+                    v-model="queryParam.financialStatus"
+                    ref="financialStatus"
+                    id="salesList-financialStatus"
+                    code="FINANCIAL_RECEIVE_STATUS"
+                    placeholder="请选择财务状态"
+                    allowClear></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="促销单">
+                <a-form-item label="是否促销单">
                   <v-select
                     v-model="queryParam.promoFlag"
                     ref="cxFlag"
@@ -100,6 +95,11 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="省份" prop="provinceSn">
+                  <Area id="salesList-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="advanced ? 24 : 6" :sm="24" :style="{textAlign: advanced ? 'center' : 'left'}">
               <div class="table-page-search-submitButtons">

+ 16 - 16
src/views/salesManagement/sendOutOrder/list.vue

@@ -11,26 +11,16 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="发货单号">
-                <a-input id="sendOut-sendBillNo" v-model.trim="queryParam.sendBillNo" allowClear placeholder="请输入发货单号"/>
+              <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <a-input id="sendOut-customeName" v-model.trim="queryParam.customeName" allowClear placeholder="请输入客户名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <a-input id="sendOut-customeName" v-model.trim="queryParam.customeName" allowClear placeholder="请输入客户名称"/>
+              <a-form-item label="发货单号">
+                <a-input id="sendOut-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="关联业务单号">
-                  <a-input id="sendOut-bizNos" v-model.trim="queryParam.bizNos" allowClear placeholder="请输入备货或调拨单号"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="托运日期">
-                  <rangeDate ref="sendDate" :value="sendtime" @change="sendDateChange" />
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="收货状态">
                   <v-select
@@ -42,6 +32,11 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="托运日期">
+                  <rangeDate ref="sendDate" :value="sendtime" @change="sendDateChange" />
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="物流情况">
                   <v-select
@@ -53,6 +48,11 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="关联业务单号">
+                  <a-input id="sendOut-bizNos" v-model.trim="queryParam.bizNos" allowClear placeholder="请输入备货或调拨单号"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="sendOut-subarea" ref="subarea" @change="subareaChange"></subarea>
@@ -235,12 +235,12 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货单号', scopedSlots: { customRender: 'sendBillNo' }, width: '12%', align: 'center' },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '地区', dataIndex: 'provinceName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'customeName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'customeName', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         // { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '托运日期', dataIndex: 'sendDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收货人', dataIndex: 'customerCacateName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },

+ 27 - 27
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -11,30 +11,41 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="shortageStatisticsCList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="产品编码">
+                <a-input id="shortageStatisticsCList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码">
-                <a-input id="shortageStatisticsCList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+              <a-form-item label="客户名称">
+                <dealerSubareaScopeList ref="custList" id="shortageStatisticsCList-buyerSn" :itemSn="queryParam.buyerSn" @change="custChange"></dealerSubareaScopeList>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="客户名称">
-                  <dealerSubareaScopeList ref="custList" id="shortageStatisticsCList-buyerSn" :itemSn="queryParam.buyerSn" @change="custChange"></dealerSubareaScopeList>
+                <a-form-item label="销售单号">
+                  <a-input id="shortageStatisticsCList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="区域">
-                  <subarea id="shortageStatisticsCList-subarea" ref="subarea" @change="subareaChange"></subarea>
+                <a-form-item label="产品状态">
+                  <v-select code="PRODUCT_STATUS" id="shortageStatisticsCList-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="省份" prop="provinceSn">
-                  <Area id="shortageStatisticsCList-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
-                </a-form-model-item>
+                <a-form-item label="产品名称">
+                  <a-input id="shortageStatisticsCList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="客户类型">
+                  <dealerType
+                    id="shortageStatisticsCList-dealerType"
+                    changeOnSelect
+                    v-model="dealerType"
+                    @change="getDealerType"
+                    allowClear
+                    placeholder="请选择商户类型"></dealertype>
+                </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="产品分类">
@@ -52,25 +63,14 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="销售单号">
-                  <a-input id="shortageStatisticsCList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="客户类型">
-                  <dealerType
-                    id="shortageStatisticsCList-dealerType"
-                    changeOnSelect
-                    v-model="dealerType"
-                    @change="getDealerType"
-                    allowClear
-                    placeholder="请选择商户类型"></dealertype>
+                <a-form-item label="区域">
+                  <subarea id="shortageStatisticsCList-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="产品状态">
-                  <v-select code="PRODUCT_STATUS" id="shortageStatisticsCList-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
-                </a-form-item>
+                <a-form-model-item label="省份" prop="provinceSn">
+                  <Area id="shortageStatisticsCList-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
+                </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="仓库">

+ 11 - 11
src/views/salesManagement/stockPrint/list.vue

@@ -22,14 +22,9 @@
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="备货单号">
-                  <a-input id="stockPrint-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
-                </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="shbuyerName" id="stockPrint-shbuyerName" @change="shcustChange" />
-                </a-form-item>
+                <a-form-model-item label="所在区域">
+                  <subarea id="stockPrint-subarea" ref="subarea" @change="subareaChange"></subarea>
+                </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="业务状态">
@@ -42,6 +37,11 @@
                     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="shbuyerName" id="stockPrint-shbuyerName" @change="shcustChange" />
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24" v-if="currentTab == 1">
                 <a-form-item label="单据状态">
                   <v-select
@@ -65,9 +65,9 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="所在区域">
-                  <subarea id="stockPrint-subarea" ref="subarea" @change="subareaChange"></subarea>
-                </a-form-model-item>
+                <a-form-item label="备货单号">
+                  <a-input id="stockPrint-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+                </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区" prop="shippingAddrProvinceSn">

+ 18 - 19
src/views/salesReturnManagement/billOfLading/list.vue

@@ -16,41 +16,40 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="总部销退单号">
-                <a-input id="billOfLading-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
+              <a-form-item label="申请人">
+                <employee style="width: 100%;" id="billOfLading-Employee" v-model="queryParam.applyPersonSn"></employee>
               </a-form-item>
             </a-col>
-
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="申请人">
-                  <employee style="width: 100%;" id="billOfLading-Employee" v-model="queryParam.applyPersonSn"></employee>
+                <a-form-item label="状态">
+                  <v-select
+                    v-model="queryParam.state"
+                    ref="state"
+                    id="billOfLading-state"
+                    code="PICK_UP_STATE"
+                    placeholder="请选择状态"
+                    allowClear></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="物流点">
-                  <a-input id="billOfLading-logisticsPoint" v-model.trim="queryParam.logisticsPoint" allowClear placeholder="请输入物流点"/>
+                <a-form-item label="审核时间">
+                  <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="发货方">
-                  <custList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" id="billOfLading-senderSn" @change="custChange" />
+                <a-form-item label="总部销退单号">
+                  <a-input id="billOfLading-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="审核时间">
-                  <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
+                <a-form-item label="物流点">
+                  <a-input id="billOfLading-logisticsPoint" v-model.trim="queryParam.logisticsPoint" allowClear placeholder="请输入物流点"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="状态">
-                  <v-select
-                    v-model="queryParam.state"
-                    ref="state"
-                    id="billOfLading-state"
-                    code="PICK_UP_STATE"
-                    placeholder="请选择状态"
-                    allowClear></v-select>
+                <a-form-item label="发货方">
+                  <custList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" id="billOfLading-senderSn" @change="custChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">

+ 12 - 12
src/views/salesReturnManagement/pickUp/list.vue

@@ -21,6 +21,18 @@
               </a-form-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="状态">
+                  <v-select
+                    v-model="queryParam.state"
+                    ref="state"
+                    id="pickUp-state"
+                    code="PICK_UP_STATE"
+                    :notIn="['WAIT_SUBMIT','WAIT_AUDIT','AUDIT_REJECT']"
+                    placeholder="请选择状态"
+                  ></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="申请人">
                   <employee style="width: 100%;" id="pickUp-Employee" v-model="queryParam.applyPersonSn"></employee>
@@ -36,18 +48,6 @@
                   <custList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" id="pickUp-senderSn" @change="custChange" />
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="状态">
-                  <v-select
-                    v-model="queryParam.state"
-                    ref="state"
-                    id="pickUp-state"
-                    code="PICK_UP_STATE"
-                    :notIn="['WAIT_SUBMIT','WAIT_AUDIT','AUDIT_REJECT']"
-                    placeholder="请选择状态"
-                  ></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>

+ 106 - 107
src/views/salesReturnManagement/returnConfirmation/list.vue

@@ -1,37 +1,25 @@
 <template>
   <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)">
-        <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-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)">
+          <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
@@ -43,82 +31,94 @@
                   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>
+            <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-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="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+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :pageSize="30"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 销退单号 -->
+          <template slot="salesReturnBillNo" slot-scope="text, record">
+            <span v-if="$hasPermissions('B_returnConfirmation_detail')" class="link-bule" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
+            <span v-else>{{ record.salesReturnBillNo }}</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              v-if="record.billStatus=='WAIT_FINANCIAL_AUDIT' && $hasPermissions('B_returnConfirmation_return')"
+              class="button-warning"
+              @click="handleAudit(record)"
+              id="returnConfirmationList-audit-btn">退货确认</a-button>
+            <span v-else>--</span>
           </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+70+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :pageSize="30"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 销退单号 -->
-        <template slot="salesReturnBillNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('B_returnConfirmation_detail')" class="link-bule" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
-          <span v-else>{{ record.salesReturnBillNo }}</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            v-if="record.billStatus=='WAIT_FINANCIAL_AUDIT' && $hasPermissions('B_returnConfirmation_return')"
-            class="button-warning"
-            @click="handleAudit(record)"
-            id="returnConfirmationList-audit-btn">退货确认</a-button>
-          <span v-else>--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 查看 -->
-    <confirmation-detail-modal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
-  </a-card>
+        </s-table>
+      </a-spin>
+      <!-- 查看 -->
+      <confirmation-detail-modal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
+    </a-card>
   </div>
 </template>
 
@@ -311,4 +311,3 @@ export default {
   }
 }
 </script>
- 

+ 26 - 26
src/views/salesReturnManagement/returnSchedule/list.vue

@@ -18,26 +18,16 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="退货申请审核时间">
-                <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
+              <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="所属区域/分区">
-                <subarea id="returnSchedule-subareaSn" ref="subarea" @change="subareaChange"></subarea>
+              <a-form-model-item label="总部销退单号">
+                <a-input id="returnSchedule-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
               </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="请输入总部销退单号"/>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="业务状态">
                   <v-select
@@ -50,8 +40,18 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="省份" prop="provinceSn">
-                  <Area id="salesReturn-provinceSn" ref="provinceBox" v-model="queryParam.provinceSn" placeholder="请选择省" @change="chooseArea"></Area>
+                <a-form-model-item label="退货申请审核时间">
+                  <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="超时环节提醒">
+                  <a-select v-model="queryParam.checkflag" allowClear placeholder="请选择超时环节提醒状态">
+                    <a-select-option value="unReturnLevel1">!未退货</a-select-option>
+                    <a-select-option value="unReturnLevel2">!!未退货</a-select-option>
+                    <a-select-option value="oneouttime">!未清点</a-select-option>
+                    <a-select-option value="twoouttime">!!未清点</a-select-option>
+                  </a-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -65,21 +65,21 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="超时环节提醒">
-                  <a-select v-model="queryParam.checkflag" allowClear placeholder="请选择超时环节提醒状态">
-                    <a-select-option value="unReturnLevel1">!未退货</a-select-option>
-                    <a-select-option value="unReturnLevel2">!!未退货</a-select-option>
-                    <a-select-option value="oneouttime">!未清点</a-select-option>
-                    <a-select-option value="twoouttime">!!未清点</a-select-option>
-                  </a-select>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-item label="客服">
                   <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="所属区域/分区">
+                  <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="省份" prop="provinceSn">
+                  <Area id="salesReturn-provinceSn" ref="provinceBox" v-model="queryParam.provinceSn" placeholder="请选择省" @change="chooseArea"></Area>
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnSchedule-refresh">查询</a-button>

+ 39 - 39
src/views/salesReturnManagement/salesReturn/list.vue

@@ -11,13 +11,13 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="审核时间">
-                <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
+              <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesReturn-buyerSn" @change="custChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesReturn-buyerSn" @change="custChange" />
+              <a-form-item label="总部销退单号">
+                <a-input id="salesReturn-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -32,18 +32,19 @@
               </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-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="salesReturn-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  id="salesReturn-billStatus"
+                  code="SALES_RETURN_BILL_STATUS"
+                  placeholder="请选择业务状态"
+                  allowClear></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -53,35 +54,28 @@
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="单据来源">
+                <a-form-model-item label="退货类型">
                   <v-select
-                    v-model="queryParam.salesReturnBillSource"
-                    ref="salesReturnBillSource"
-                    id="salesReturn-salesReturnBillSource"
-                    code="SALES_SOURCE"
-                    placeholder="请选择单据来源"
+                    v-model="queryParam.salesReturnType"
+                    id="departUser-salesReturnType"
+                    code="SALES_RETURN_TYPE"
+                    placeholder="请选择退货类型"
                     allowClear></v-select>
-                </a-form-item>
+                </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="是否同步给客户">
-                  <v-select
-                    v-model="queryParam.syncFlag"
-                    ref="syncFlag"
-                    id="salesReturn-syncFlag"
-                    code="FLAG"
-                    placeholder="请选择是否同步给客户"
-                    allowClear></v-select>
-                </a-form-item>
+                <a-form-model-item label="退货仓库">
+                  <warehouse ref="warehouse" v-model="queryParam.warehouseSn"></warehouse>
+                </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="业务状态">
+                <a-form-item label="单据来源">
                   <v-select
-                    v-model="queryParam.billStatus"
-                    ref="billStatus"
-                    id="salesReturn-billStatus"
-                    code="SALES_RETURN_BILL_STATUS"
-                    placeholder="请选择业务状态"
+                    v-model="queryParam.salesReturnBillSource"
+                    ref="salesReturnBillSource"
+                    id="salesReturn-salesReturnBillSource"
+                    code="SALES_SOURCE"
+                    placeholder="请选择单据来源"
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
@@ -96,9 +90,15 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="退货仓库">
-                  <warehouse ref="warehouse" v-model="queryParam.warehouseSn"></warehouse>
-                </a-form-model-item>
+                <a-form-item label="是否同步给客户">
+                  <v-select
+                    v-model="queryParam.syncFlag"
+                    ref="syncFlag"
+                    id="salesReturn-syncFlag"
+                    code="FLAG"
+                    placeholder="请选择是否同步给客户"
+                    allowClear></v-select>
+                </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-item label="客服">

+ 8 - 8
src/views/supplierManagement/associatedProductDetails/list.vue

@@ -11,24 +11,24 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="associatedProductList-productName" v-model.trim="queryParam.product.name" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="产品编码/原厂编码">
+                <a-input id="associatedProductList-productCode" v-model.trim="queryParam.product.queryWord" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码/原厂编码">
-                <a-input id="associatedProductList-productCode" v-model.trim="queryParam.product.queryWord" allowClear placeholder="请输入产品编码"/>
+              <a-form-item label="产品名称">
+                <a-input id="associatedProductList-productName" v-model.trim="queryParam.product.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="产品分类">
-                  <ProductType id="associatedProductList-productType" v-model="productType" @change="changeProductType"></ProductType>
+                <a-form-item label="品牌">
+                  <ProductBrand id="associatedProductList-productBrandSn" v-model="queryParam.product.productBrandSn"></ProductBrand>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="品牌">
-                  <ProductBrand id="associatedProductList-productBrandSn" v-model="queryParam.product.productBrandSn"></ProductBrand>
+                <a-form-item label="产品分类">
+                  <ProductType id="associatedProductList-productType" v-model="productType" @change="changeProductType"></ProductType>
                 </a-form-item>
               </a-col>
             </template>

+ 4 - 4
src/views/supplierManagement/costSetRecord/list.vue

@@ -6,13 +6,13 @@
         <a-form layout="inline" id="costSetRecordList-form" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="costSetRecordList-productName" v-model.trim="queryParam.product.name" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="产品编码/原厂编码">
+                <a-input id="costSetRecordList-productCode" v-model.trim="queryParam.product.queryWord" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码/原厂编码">
-                <a-input id="costSetRecordList-productCode" v-model.trim="queryParam.product.queryWord" allowClear placeholder="请输入产品编码"/>
+              <a-form-item label="产品名称">
+                <a-input id="costSetRecordList-productName" v-model.trim="queryParam.product.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">

+ 13 - 13
src/views/supplierManagement/costSetting/list.vue

@@ -5,14 +5,25 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" id="costSetList-form" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品编码/原厂编码">
+                <a-input id="costSetList-productCode" v-model.trim="queryParam.product.queryWord" allowClear placeholder="请输入产品编码"/>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="产品名称">
                 <a-input id="costSetList-productName" v-model.trim="queryParam.product.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码/原厂编码">
-                <a-input id="costSetList-productCode" v-model.trim="queryParam.product.queryWord" allowClear placeholder="请输入产品编码"/>
+              <a-form-item label="审核状态">
+                <v-select
+                  v-model="queryParam.auditState"
+                  ref="auditState"
+                  id="costSetList-auditState"
+                  code="SUPPLIER_PRODUCT_STATE"
+                  placeholder="请选择审核状态"
+                  allowClear></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -30,17 +41,6 @@
                 <a-input id="costSetList-productName" v-model.trim="queryParam.supplierName" 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="costSetList-auditState"
-                  code="SUPPLIER_PRODUCT_STATE"
-                  placeholder="请选择审核状态"
-                  allowClear></v-select>
-              </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="costSetList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="costSetList-reset">重置</a-button>