Bladeren bron

添加注释和id

chenrui 1 jaar geleden
bovenliggende
commit
e695db9684

+ 5 - 6
src/views/reportData/actualSalesReport/list.vue

@@ -14,7 +14,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="下推时间" prop="time">
-                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate ref="rangeDate" id="actualSalesReportList-time" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -27,22 +27,21 @@
                 <v-select
                   v-model="queryParam.dealer.dealerLevel"
                   ref="dealerLevel"
-                  id="actualSalesReportList-allocateTypeSn"
+                  id="actualSalesReportList-dealerLevel"
                   code="DEALER_LEVEL"
                   placeholder="请选择客户级别"
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
-
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
-                  <subarea id="actualSalesReportList-allocateTypeSn" ref="subarea" @change="subareaChange"></subarea>
+                  <subarea id="actualSalesReportList-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="区域负责人">
-                  <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                  <BizUser id="actualSalesReportList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -52,7 +51,7 @@
               </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-model-item label="客服">
-                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                  <customerService ref="customerName" id="actualSalesReportList-customerName" v-model="queryParam.bizUserSn"></customerService>
                 </a-form-model-item>
               </a-col>
             </template>

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

@@ -16,7 +16,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="调拨开单日期" prop="time">
-                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate ref="rangeDate" id="allocationDetailsList-time" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -64,7 +64,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="出库仓库">
-                  <chooseWarehouse ref="warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
+                  <chooseWarehouse ref="warehouse" id="allocationDetailsList-warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -84,12 +84,12 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
-                  <Area id="allocationDetailsList-shippingAddrProvinceSn" v-model="queryParam.dealerProvinceSn" placeholder="请选择省"></Area>
+                  <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" v-model="queryParam.bizUserSn"></customerService>
+                  <customerService ref="customerName" id="allocationDetailsList-customerName" v-model="queryParam.bizUserSn"></customerService>
                 </a-form-model-item>
               </a-col>
             </template>

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

@@ -16,7 +16,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="调拨开单日期" prop="time">
-                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate ref="rangeDate" id="allocationOrderTotalList-time" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -45,7 +45,7 @@
             </a-col>
             <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
               <a-form-model-item label="客服">
-                <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                <customerService ref="customerName" id="allocationDetailsList-customerName" v-model="queryParam.bizUserSn"></customerService>
               </a-form-model-item>
             </a-col>
             <a-col :md="isShowCustomerSearch?6:24" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: !isShowCustomerSearch?'center':''}">

+ 4 - 2
src/views/reportData/promotionSalesOrderReport/list.vue

@@ -16,6 +16,7 @@
               <a-form-model-item label="统计月份" prop="monthInfo">
                 <div class="monthBox" style="display:flex;align-item:center;">
                   <a-month-picker
+                    id="promotionSalesList-startValue"
                     :disabled-date="disabledStartDate"
                     format="YYYY-MM"
                     v-model="startValue"
@@ -25,6 +26,7 @@
                   />
                   <span>~</span>
                   <a-month-picker
+                    id="promotionSalesList-endValue"
                     :disabled-date="disabledEndDate"
                     format="YYYY-MM"
                     v-model="endValue"
@@ -38,12 +40,12 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="区域/分区">
-                <subarea id="promotionSalesList-allocateTypeSn" ref="subarea" @change="subareaChange"></subarea>
+                <subarea id="promotionSalesList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="区域负责人">
-                <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                <BizUser id="promotionSalesList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
               </a-form-model-item>
             </a-col>
             <a-form-model-item label="省份">

+ 7 - 4
src/views/reportData/promotionSalesRealTimeReport/index.vue

@@ -9,17 +9,19 @@
               <a-form-model
                 layout="inline"
                 ref="ruleForm"
+                id="promotionSalesRealTimeReport-form"
                 :rules="rules"
                 :model="queryParam">
                 <a-row :gutter="15">
                   <a-col :md="6" :sm="24">
                     <a-form-model-item label="销售审核时间" prop="salesDate">
-                      <rangeDate ref="rangeDate" :value="queryParam.salesDate" @change="salesDateChange" />
+                      <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"
@@ -104,14 +106,14 @@
                     </a-col>
                     <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                       <a-form-model-item label="客服">
-                        <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                        <customerService id="promotionSalesRealTimeReport-customerName" ref="customerName" v-model="queryParam.bizUserSn"></customerService>
                       </a-form-model-item>
                     </a-col>
                   </template>
                   <a-col :md="isShowCustomerSearch?24:6" :sm="24" :style="{textAlign: isShowCustomerSearch?'center':''}">
                     <div class="table-page-search-submitButtons">
-                      <a-button type="primary" :disabled="disabled" @click="testForm('search')" >查询</a-button>
-                      <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm">重置</a-button>
+                      <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>
                       <a-button
                         style="margin-left: 10px"
                         type="primary"
@@ -119,6 +121,7 @@
                         @click="testForm('export')"
                         :disabled="disabled"
                         :loading="exportLoading"
+                        id="promotionSalesRealTimeReport-export"
                         v-if="$hasPermissions('B_promotionSalesExport')"
                       >导出</a-button>
                       <a @click="advanced=!advanced" style="margin-left: 8px">

+ 16 - 14
src/views/reportData/promotionSalesRealTimeReport/list.vue

@@ -4,11 +4,11 @@
       <a-card size="small" :bordered="false" class="searchBoxNormal">
         <!-- 查询 -->
         <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
-          <a-form-model layout="inline" ref="ruleForm" :rules="rules" :model="newQueryParam">
+          <a-form-model id="promotionSalesRealTimeList-form" layout="inline" ref="ruleForm" :rules="rules" :model="newQueryParam">
             <a-row :gutter="15">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="下推时间" prop="salesDate">
-                  <rangeDate ref="rangeDate" :value="newQueryParam.salesDate" @change="salesDateChange" />
+                  <rangeDate id="promotionSalesRealTimeList-salesDate" ref="rangeDate" :value="newQueryParam.salesDate" @change="salesDateChange" />
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -17,6 +17,7 @@
                     style="width:100%"
                     v-model="time"
                     :format="dateFormat"
+                    id="promotionSalesRealTimeList-time"
                     :placeholder="['开始时间', '结束时间']"
                     @change="dateChange"></a-range-picker>
                 </a-form-model-item>
@@ -24,7 +25,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="促销名称">
                   <a-input
-                    id="promotionSalesRealTimeReport-title"
+                    id="promotionSalesRealTimeList-title"
                     v-model.trim="newQueryParam.promoRuleReport.title"
                     allowClear
                     placeholder="请输入促销名称" />
@@ -36,7 +37,7 @@
                     <v-select
                       v-model="newQueryParam.promoRuleReport.promotionRuleType"
                       ref="ruleType"
-                      id="promotionSalesRealTimeReport-ruleType"
+                      id="promotionSalesRealTimeList-ruleType"
                       code="PROMOTION_RULE_TYPE"
                       placeholder="请选择促销类型"
                       allowClear></v-select>
@@ -45,7 +46,7 @@
                 <a-col :md="6" :sm="24">
                   <a-form-model-item label="规则">
                     <a-input
-                      id="promotionSalesRealTimeReport-ruleInfo"
+                      id="promotionSalesRealTimeList-ruleInfo"
                       v-model.trim="newQueryParam.promoRuleReport.ruleInfo"
                       allowClear
                       placeholder="请输入规则关键字" />
@@ -54,7 +55,7 @@
                 <a-col :md="6" :sm="24">
                   <a-form-model-item label="销售单号">
                     <a-input
-                      id="promotionSalesRealTimeReport-salesBillNo"
+                      id="promotionSalesRealTimeList-salesBillNo"
                       v-model.trim="newQueryParam.salesBillNo"
                       allowClear
                       placeholder="请输入销售单号" />
@@ -65,7 +66,7 @@
                     <v-select
                       v-model="newQueryParam.buyerLevel"
                       ref="buyerLevel"
-                      id="promotionSalesRealTimeReport-buyerLevel"
+                      id="promotionSalesRealTimeList-buyerLevel"
                       code="DEALER_LEVEL"
                       placeholder="请选择客户级别"
                       allowClear></v-select>
@@ -74,7 +75,7 @@
                 <a-col :md="6" :sm="24">
                   <a-form-model-item label="客户名称">
                     <a-input
-                      id="promotionSalesRealTimeReport-buyerName"
+                      id="promotionSalesRealTimeList-buyerName"
                       v-model.trim="newQueryParam.buyerName"
                       allowClear
                       placeholder="请输入客户名称" />
@@ -82,24 +83,24 @@
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-model-item label="所在区域">
-                    <subarea ref="subarea" id="promotionSalesRealTimeReport-subarea" @change="subareaChange"></subarea>
+                    <subarea ref="subarea" id="promotionSalesRealTimeList-subarea" @change="subareaChange"></subarea>
                   </a-form-model-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-model-item label="地区">
-                    <AreaList id="promotionSalesRealTimeReport-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
+                    <AreaList id="promotionSalesRealTimeList-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 ref="customerName" v-model="newQueryParam.bizUserSn"></customerService>
+                    <customerService ref="customerName" id="promotionSalesRealTimeList-customerName" v-model="newQueryParam.bizUserSn"></customerService>
                   </a-form-model-item>
                 </a-col>
               </template>
               <a-col :md="6" :sm="24">
                 <span class="table-page-search-submitButtons">
-                  <a-button type="primary" :disabled="disabled" @click="testForm('search')">查询</a-button>
-                  <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm">重置</a-button>
+                  <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>
                   <a-button
                     style="margin-left: 10px"
                     type="primary"
@@ -107,6 +108,7 @@
                     @click="testForm('export')"
                     :disabled="disabled"
                     :loading="exportLoading"
+                    id="promotionSalesRealTimeList-export"
                     v-if="$hasPermissions('B_promotionSalesExport')">导出</a-button>
                   <a @click="advanced=!advanced" style="margin-left: 8px">
                     {{ advanced ? '收起' : '展开' }}
@@ -192,7 +194,7 @@ import AreaList from '@/views/common/areaList.js'
 // 接口
 import { salesPromoRealReportList, salesPromoRealReportCount, exportSalesPromoRealReport } from '@/api/reportData'
 export default {
-  name: 'GatherList',
+  name: 'PromotionSalesRealTimeList',
   mixins: [commonMixin],
   components: { STable, VSelect, reportModal, AreaList, rangeDate, subarea, customerService },
   data () {

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

@@ -14,7 +14,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="下推时间" prop="time">
-                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate ref="rangeDate" id="salesAmountReportList-time" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -27,7 +27,7 @@
                 <v-select
                   v-model="queryParam.dealerLevel"
                   ref="dealerLevel"
-                  id="salesAmountReportList-allocateTypeSn"
+                  id="salesAmountReportList-dealerLevel"
                   code="DEALER_LEVEL"
                   placeholder="请选择客户级别"
                   allowClear></v-select>
@@ -36,12 +36,12 @@
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
-                  <subarea id="salesAmountReportList-allocateTypeSn" ref="subarea" @change="subareaChange"></subarea>
+                  <subarea id="salesAmountReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="区域负责人">
-                  <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                  <BizUser id="salesAmountReportList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -51,7 +51,7 @@
               </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-item label="客服">
-                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                  <customerService id="salesAmountReportList-customerName" ref="customerName" v-model="queryParam.bizUserSn"></customerService>
                 </a-form-item>
               </a-col>
             </template>

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

@@ -4,7 +4,7 @@
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
-          id="salesSlipReportList-form"
+          id="salesDetailsList-form"
           ref="ruleForm"
           class="form-model-con"
           layout="inline"
@@ -14,7 +14,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="下推时间" prop="time">
-                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate ref="rangeDate" id="salesDetailsList-time" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -71,7 +71,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="出库仓库">
-                  <chooseWarehouse ref="warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
+                  <chooseWarehouse id="salesDetailsList-warehouseSn" ref="warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -81,7 +81,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="区域负责人">
-                  <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                  <BizUser id="salesDetailsList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -91,7 +91,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="促销产品">
-                  <a-select v-model="queryParam.giftFLag" placeholder="请选择促销产品" allowClear>
+                  <a-select id="salesDetailsList-giftFlag" v-model="queryParam.giftFLag" placeholder="请选择促销产品" allowClear>
                     <a-select-option value="1">
                     </a-select-option>
@@ -103,7 +103,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="产品类型" prop="promotionFlag">
-                  <a-select allowClear v-model.trim="queryParam.promotionFlag" :dropdownMatchSelectWidth="false" placeholder="请选择产品类型">
+                  <a-select id="salesDetailsList-promotionFlag" allowClear v-model.trim="queryParam.promotionFlag" :dropdownMatchSelectWidth="false" placeholder="请选择产品类型">
                     <a-select-option value="0">
                       正常产品
                     </a-select-option>
@@ -124,7 +124,7 @@
               </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-model-item label="客服">
-                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                  <customerService id="salesDetailsList-customerName" ref="customerName" v-model="queryParam.bizUserSn"></customerService>
                 </a-form-model-item>
               </a-col>
             </template>

+ 4 - 3
src/views/reportData/salesOrderTotal/list.vue

@@ -14,7 +14,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="下推时间" prop="time">
-                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate ref="rangeDate" id="salesOrderTotalList-time" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -83,7 +83,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区" prop="dealerProvinceSn">
                   <Area
-                    id="salesOrderTotalList-shippingAddrProvinceSn"
+                    id="salesOrderTotalList-dealerProvinceSn"
                     defValKey="id"
                     v-model="queryParam.dealerProvinceSn"
                     placeholder="请选择省"></Area>
@@ -91,7 +91,7 @@
               </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-model-item label="客服">
-                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                  <customerService id="salesOrderTotalList-bizUserSn" ref="customerName" v-model="queryParam.bizUserSn"></customerService>
                 </a-form-model-item>
               </a-col>
             </template>
@@ -135,6 +135,7 @@
             style="min-width: 200px"
             dropdownMatchSelectWidth
             :maxTagCount="3"
+            id="salesOrderTotalList-isShowColumn"
             :tree-data="colsArr"
             tree-checkable
             placeholder="请选择要显示的列(多选)"

+ 51 - 36
src/views/reportData/salesReturnDetailReport/list.vue

@@ -4,7 +4,7 @@
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
-          id="salesSlipReportList-form"
+          id="salesReturnDetailList-form"
           ref="ruleForm"
           class="form-model-con"
           layout="inline"
@@ -14,7 +14,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="退货完成日期" prop="time">
-                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate ref="rangeDate" id="salesReturnDetailList-time" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -71,7 +71,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="退货仓库">
-                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+                  <chooseWarehouse ref="warehouse" id="salesReturnDetailList-warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -81,7 +81,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="区域负责人">
-                  <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                  <BizUser id="salesReturnDetailList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -94,7 +94,7 @@
                   <v-select
                     v-model="queryParam.goodFlag"
                     ref="goodFlag"
-                    id="returnSchedule-goodFlag"
+                    id="salesReturnDetailList-goodFlag"
                     code="GOOD_FLAG"
                     placeholder="请选择退货类别"
                     allowClear></v-select>
@@ -104,16 +104,16 @@
                 <a-form-model-item label="退货类型">
                   <v-select
                     v-model="queryParam.salesReturnType"
-                    id="departUser-salesReturnType"
+                    id="salesReturnDetailList-salesReturnType"
                     code="SALES_RETURN_TYPE"
                     placeholder="请选择退货类型"
                     allowClear></v-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-form-model-item label="客服">
+                  <customerService id="salesReturnDetailList-customerName" ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                </a-form-model-item>
               </a-col>
             </template>
             <a-col :md="isShowCustomerSearch?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: isShowCustomerSearch?'center':''}">
@@ -155,6 +155,7 @@
             dropdownMatchSelectWidth
             :maxTagCount="3"
             :tree-data="colsArr"
+            id="salesReturnDetailList-isShowColumn"
             tree-checkable
             placeholder="请选择要显示的列(多选)"
           />
@@ -207,6 +208,8 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
+import { hdExportExcel } from '@/libs/exportExcel'
+// 组件
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
@@ -217,7 +220,7 @@ import customerService from '@/views/common/customerService'
 import ProductBrand from '@/views/common/productBrand.js'
 import ProductType from '@/views/common/productType.js'
 import BizUser from '@/views/common/bizUser.js'
-import { hdExportExcel } from '@/libs/exportExcel'
+// 接口
 import { reportSalesReturnDetailList, reportSalesReturnDetailCount, reportSalesReturnDetailExport } from '@/api/reportData'
 export default {
   name: 'SalesReturnDetailReportList',
@@ -227,55 +230,59 @@ export default {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
-      showExport: false,
-      queryParam: { //  查询条件
+      tableHeight: 0, // 表格高度
+      showExport: false, // 导出弹窗
+      disabled: false, //  查询、重置按钮是否可操作
+      exportLoading: false, // 导出按钮加载状态
+      //  查询条件
+      queryParam: {
+        // 退货完成日期 默认值
         time: [
           getDate.getCurrMonthDays().starttime,
           getDate.getCurrMonthDays().endtime
         ],
-        beginDate: getDate.getCurrMonthDays().starttime,
-        endDate: getDate.getCurrMonthDays().endtime,
-        salesReturnBillNo: '',
-        productCode: '',
-        productName: '',
-        dealerName: '',
-        dealerLevel: undefined,
-        goodFlag: undefined,
-        salesReturnType: undefined,
-        productBrandTypeSn: undefined,
+        beginDate: getDate.getCurrMonthDays().starttime, // 开始日期
+        endDate: getDate.getCurrMonthDays().endtime, // 结束日期
+        salesReturnBillNo: '', // 退货单号
+        productCode: '', // 产品编码
+        productName: '', // 产品名称
+        dealerName: '', // 客户名称
+        dealerLevel: undefined, // 客户等级
+        goodFlag: undefined, // 退货类别
+        salesReturnType: undefined, // 退货类型
+        productBrandTypeSn: undefined, // 品牌分类
         productBrandSn: undefined, //  产品品牌
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
-        warehouseSn: undefined,
+        warehouseSn: undefined, // 出库仓库
         subareaArea: {
-          subareaSn: undefined,
-          subareaAreaSn: undefined,
-          bizUserSn: undefined
+          subareaSn: undefined, // 区域
+          subareaAreaSn: undefined, // 分区
+          bizUserSn: undefined// 区域负责人
         },
-        dealerProvinceSn: undefined,
-        dealerCitySn: undefined,
-        dealerCountySn: undefined,
-        bizUserSn: undefined
+        dealerProvinceSn: undefined, // 省
+        dealerCitySn: undefined, // 市
+        dealerCountySn: undefined, // 区
+        bizUserSn: undefined// 客服
       },
-      productType: [],
       rules: {
         'time': [{ required: true, message: '请选择退货完成日期', trigger: 'change' }]
       },
-      disabled: false, //  查询、重置按钮是否可操作
-      exportLoading: false,
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
         delete params.time
+        // 获取列表数据 有分页
         return reportSalesReturnDetailList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
+            // 统计
             this.getCount(params)
+            // 计算表格序号
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
@@ -286,7 +293,8 @@ export default {
           return data
         })
       },
-      totalData: null,
+      productType: [], // 产品分类
+      totalData: null, // 统计数据
       // 列表列显示
       showCols: [], // 已勾选的列
       colsArr: [
@@ -406,6 +414,7 @@ export default {
     }
   },
   watch: {
+    // 展开关闭
     advanced (newValue, oldValue) {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
@@ -431,6 +440,7 @@ export default {
         }
       })
     },
+    // 查询
     handleSearch () {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
@@ -442,7 +452,7 @@ export default {
         }
       })
     },
-    //  创建时间  change
+    //  退货完成日期  change
     dateChange (date) {
       if (date[0] && date[1]) {
         this.queryParam.time = date
@@ -452,6 +462,7 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
+    // 客户名称 change
     custChange (val) {
       this.queryParam.dealerSn = val.key
     },
@@ -481,6 +492,7 @@ export default {
       this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
       this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
     },
+    // 区域分区  change
     subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
@@ -523,15 +535,18 @@ export default {
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()
     },
+    // 地区
     areaChange (val) {
       this.queryParam.dealerProvinceSn = val[0] ? val[0] : ''
       this.queryParam.dealerCitySn = val[1] ? val[1] : ''
       this.queryParam.dealerCountySn = val[2] ? val[2] : ''
     },
+    // 初始化
     pageInit () {
       this.resetSearchForm()
       this.setTableH()
     },
+    // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 230

+ 44 - 30
src/views/reportData/salesReturnsReport/list.vue

@@ -14,7 +14,7 @@
           <a-row :gutter="15">
             <a-col :md="7" :sm="24">
               <a-form-model-item label="退货完成日期" prop="time">
-                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate ref="rangeDate" id="salesReturnsReportList-time" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="5" :sm="24">
@@ -53,7 +53,7 @@
                 <a-form-model-item label="退货类型">
                   <v-select
                     v-model="queryParam.salesReturnType"
-                    id="departUser-salesReturnType"
+                    id="salesReturnsReportList-salesReturnType"
                     code="SALES_RETURN_TYPE"
                     placeholder="请选择退货类型"
                     allowClear></v-select>
@@ -61,7 +61,7 @@
               </a-col>
               <a-col :md="7" :sm="24">
                 <a-form-model-item label="退货仓库">
-                  <chooseWarehouse ref="warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
+                  <chooseWarehouse id="salesReturnsReportList-warehouse" ref="warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
               <a-col :md="7" :sm="24">
@@ -69,16 +69,16 @@
                   <v-select
                     v-model="queryParam.goodFlag"
                     ref="goodFlag"
-                    id="returnSchedule-goodFlag"
+                    id="salesReturnsReportList-goodFlag"
                     code="GOOD_FLAG"
                     placeholder="请选择退货类别"
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="5" :sm="24" v-show="isShowCustomerSearch">
-                <a-form-item label="客服">
-                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
-                </a-form-item>
+                <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;">
@@ -115,6 +115,7 @@
           <span>显示:</span>
           <a-tree-select
             size="small"
+            id="salesReturnsReportList-isShowColumn"
             v-model="showCols"
             style="min-width: 200px"
             dropdownMatchSelectWidth
@@ -134,7 +135,7 @@
           :data="loadData"
           :pageSize="30"
           :style="{ height: tableHeight+70+'px' }"
-          :scroll="{ x: 1740, y: tableHeight - 30 }"
+          :scroll="{ x: 1740, y: tableHeight - 40 }"
           :defaultLoadData="false"
           bordered>
           <template slot="footer">
@@ -158,15 +159,17 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
+import { hdExportExcel } from '@/libs/exportExcel'
+// 组件
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
-import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import reportModal from '@/views/common/reportModal.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
 import customerService from '@/views/common/customerService'
 import AreaList from '@/views/common/areaList.js'
-import { hdExportExcel } from '@/libs/exportExcel'
+import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
+// 接口
 import { reportSalesReturnList, reportSalesReturnCount, salesReturnsExport } from '@/api/reportData'
 export default {
   name: 'SalesReturnsReportList',
@@ -175,46 +178,51 @@ export default {
   data () {
     return {
       spinning: false,
-      exportLoading: false,
+      exportLoading: false, // 导出按钮加载状态
       advanced: true, // 高级搜索 展开/关闭
-      tableHeight: 0,
-      showExport: false,
-      queryParam: { //  查询条件
+      tableHeight: 0, // 表格高度
+      showExport: false, // 导出弹窗
+      disabled: false, //  查询、重置按钮是否可操作
+      //  查询条件
+      queryParam: {
+        // 退货完成日期  默认值
         time: [
           getDate.getCurrMonthDays().starttime,
           getDate.getCurrMonthDays().endtime
         ],
-        beginDate: getDate.getCurrMonthDays().starttime,
-        endDate: getDate.getCurrMonthDays().endtime,
-        salesReturnBillNo: '',
-        goodFlag: undefined,
-        salesReturnType: undefined,
+        beginDate: getDate.getCurrMonthDays().starttime, // 开始日期
+        endDate: getDate.getCurrMonthDays().endtime, // 结束日期
+        salesReturnBillNo: '', // 退货单号
+        goodFlag: undefined, // 退货类别
+        salesReturnType: undefined, // 退货类型
         subareaArea: {
-          subareaSn: undefined,
-          subareaAreaSn: undefined
+          subareaSn: undefined, // 区域
+          subareaAreaSn: undefined// 分区
         },
-        warehouseSn: undefined,
-        dealerSn: '',
-        dealerProvinceSn: undefined,
-        dealerCitySn: undefined,
-        dealerCountySn: undefined,
+        warehouseSn: undefined, // 出库仓库
+        dealerSn: '', // 客户sn
+        dealerProvinceSn: undefined, // 省
+        dealerCitySn: undefined, // 市
+        dealerCountySn: undefined, // 区
         bizUserSn: undefined// 客服
       },
       rules: {
         'time': [{ required: true, message: '请选择退货完成日期', trigger: 'change' }]
       },
-      disabled: false, //  查询、重置按钮是否可操作
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
         delete params.time
+        // 获取列表数据  有分页
         return reportSalesReturnList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
+            // 统计
             this.getCount(params)
+            // 计算表格序号
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
@@ -225,7 +233,7 @@ export default {
           return data
         })
       },
-      totalData: null,
+      totalData: null, // 统计数据
       colsArr: [
         {
           title: '直接差价金额(明细)',
@@ -240,7 +248,7 @@ export default {
           disabled: !this.$hasPermissions('M_salesOrderTotalList_salesPrice')
         }
       ],
-      showCols: []
+      showCols: []// 已选择显示的列
     }
   },
   computed: {
@@ -298,6 +306,7 @@ export default {
     }
   },
   watch: {
+    // 展开关闭
     advanced (newValue, oldValue) {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
@@ -343,6 +352,7 @@ export default {
         }
       })
     },
+    // 查询
     handleSearch () {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
@@ -364,9 +374,11 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
+    // 客户名称 change
     custChange (val) {
       this.queryParam.dealerSn = val.key
     },
+    // 区域分区 change
     subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
@@ -401,14 +413,16 @@ export default {
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()
     },
+    // 地区
     areaChange (val) {
       this.queryParam.dealerProvinceSn = val[0] ? val[0] : ''
       this.queryParam.dealerCitySn = val[1] ? val[1] : ''
       this.queryParam.dealerCountySn = val[2] ? val[2] : ''
     },
+    // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 200
+      this.tableHeight = window.innerHeight - tableSearchH - 232
     }
   },
   mounted () {

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

@@ -14,7 +14,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="下推时间" prop="time">
-                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate ref="rangeDate" id="salesSlipReportList-time" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -27,7 +27,7 @@
                 <v-select
                   v-model="queryParam.dealerLevel"
                   ref="dealerLevel"
-                  id="salesSlipReportList-allocateTypeSn"
+                  id="salesSlipReportList-dealerLevel"
                   code="DEALER_LEVEL"
                   placeholder="请选择客户级别"
                   allowClear></v-select>
@@ -35,23 +35,23 @@
             </a-col>
             <a-col :md="6" :sm="24" v-if="isShowCustomerSearch">
               <a-form-model-item label="销售单号">
-                <a-input id="salesSlipReportList-allocateTypeSn" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+                <a-input id="salesSlipReportList-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="销售单号">
-                  <a-input id="salesSlipReportList-allocateTypeSn" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+                  <a-input id="salesSlipReportList-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="所在区域">
-                  <subarea id="salesSlipReportList-allocateTypeSn" ref="subarea" @change="subareaChange"></subarea>
+                  <subarea id="salesSlipReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="区域负责人">
-                  <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                  <BizUser id="salesSlipReportList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -61,7 +61,7 @@
               </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-model-item label="客服">
-                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                  <customerService id="salesSlipReportList-customerName" ref="customerName" v-model="queryParam.bizUserSn"></customerService>
                 </a-form-model-item>
               </a-col>
             </template>

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

@@ -1,10 +1,10 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="tireSalesDealerList-wrap searchBoxNormal">
+    <a-card size="small" :bordered="false" class="tireSalesReportList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
-          id="tireSalesDealerList-form"
+          id="tireSalesReportList-form"
           ref="ruleForm"
           class="form-model-con"
           layout="inline"
@@ -13,22 +13,28 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="日期" prop="time">
-                <rangeDate ref="rangeDate" :showTime="false" :today="false" :value="queryParam.time" @change="dateChange" />
+                <rangeDate
+                  ref="rangeDate"
+                  id="tireSalesReportList-time"
+                  :showTime="false"
+                  :today="false"
+                  :value="queryParam.time"
+                  @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="地区">
-                <AreaList id="tireSalesDealerList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
+                <AreaList id="tireSalesReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="区域/分区">
-                <subarea id="tireSalesDealerList-subarea" ref="subarea" @change="subareaChange"></subarea>
+                <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="客户名称">
-                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="tireSalesDealerList-dealerName" @change="custChange" />
+                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="tireSalesReportList-dealerName" @change="custChange" />
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
@@ -37,7 +43,7 @@
                   <v-select
                     v-model="queryParam.dealerLevel"
                     ref="dealerLevel"
-                    id="tireSalesDealerList-dealerLevel"
+                    id="tireSalesReportList-dealerLevel"
                     code="DEALER_LEVEL"
                     placeholder="请选择客户级别"
                     allowClear></v-select>
@@ -45,17 +51,17 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="区域负责人">
-                  <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                  <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="产品编码/原厂编码">
-                  <a-input id="tireSalesDealerList-productWord" v-model.trim="queryParam.productWord" allowClear placeholder="请输入产品编码/原厂编码"/>
+                  <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="tireSalesDealerList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+                  <a-input id="tireSalesReportList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
                 </a-form-model-item>
               </a-col>
             </template>
@@ -65,12 +71,12 @@
                 type="primary"
                 @click="handleSearch"
                 :disabled="disabled"
-                id="tireSalesDealerList-refresh">查询</a-button>
+                id="tireSalesReportList-refresh">查询</a-button>
               <a-button
                 style="margin-left: 8px"
                 @click="resetSearchForm"
                 :disabled="disabled"
-                id="tireSalesDealerList-reset">重置</a-button>
+                id="tireSalesReportList-reset">重置</a-button>
               <a-button
                 style="margin-left: 10px"
                 type="primary"
@@ -79,7 +85,7 @@
                 :disabled="disabled"
                 :loading="exportLoading"
                 v-if="$hasPermissions('B_tireReportExport')"
-                id="tireSalesDealerList-export">导出</a-button>
+                id="tireSalesReportList-export">导出</a-button>
               <a-button
                 style="margin-left: 10px"
                 type="primary"
@@ -88,7 +94,7 @@
                 :disabled="disabled"
                 :loading="exportLoading"
                 v-if="$hasPermissions('B_tireDetailExport')"
-                id="tireSalesDealerList-export">导出出库明细</a-button>
+                id="tireSalesReportList-exportDetail">导出出库明细</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'" />
@@ -124,7 +130,7 @@
               type="link"
               class="button-warning"
               @click="handleOutDetail(record)"
-              id="transferReturnConfirmation-audit-btn">出库明细</a-button>
+              id="tireSalesReportList-outDetail">出库明细</a-button>
             <span v-else>--</span>
           </template>
           <template slot="footer">
@@ -175,7 +181,7 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 // 接口
 import { queryTireDetailCount, tireListExport, tireReportDetailList, tireOutDetailListExport } from '@/api/reportData'
 export default {
-  name: 'TireSalesDealerList',
+  name: 'TireSalesReportList',
   mixins: [commonMixin],
   components: { STable, VSelect, outDetailModal, rangeDate, subarea, AreaList, BizUser, dealerSubareaScopeList, reportModal },
   data () {

+ 8 - 2
src/views/reportData/tireSalesReport/list.vue

@@ -13,7 +13,13 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="日期" prop="time">
-                <rangeDate ref="rangeDate" :showTime="false" :today="false" :value="queryParam.time" @change="dateChange" />
+                <rangeDate
+                  ref="rangeDate"
+                  :showTime="false"
+                  :today="false"
+                  :value="queryParam.time"
+                  id="tireSalesDealerList-time"
+                  @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -45,7 +51,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="区域负责人">
-                  <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                  <BizUser id="tireSalesDealerList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
                 </a-form-model-item>
               </a-col>
             </template>

+ 60 - 54
src/views/reportData/transferReturnDetailReport/list.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="allocateReturnDetailReport-wrap searchBoxNormal">
+    <a-card size="small" :bordered="false" class="transferReturnDetailReport-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
-          id="salesSlipReportList-form"
+          id="transferReturnDetailReport-form"
           ref="ruleForm"
           class="form-model-con"
           layout="inline"
@@ -14,74 +14,74 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="退货完成日期" prop="time">
-                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <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="allocateReturnDetailReport-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo" allowClear placeholder="请输入调拨退货单号"/>
+                <a-input id="transferReturnDetailReport-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo" allowClear placeholder="请输入调拨退货单号"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="调拨退货对象名称">
-                <a-input id="allocateReturnDetailReport-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调拨退货对象名称"/>
-              </a-form-item>
+              <a-form-model-item label="调拨退货对象名称">
+                <a-input id="transferReturnDetailReport-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调拨退货对象名称"/>
+              </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="调拨退货类型">
-                <AllocateType id="allocateReturnDetailReport-allocateReturnTypeSn" :changeOnSelect="true" v-model="allocateTypeVal" @change="changeAllocatype"></AllocateType>
-              </a-form-item>
+              <a-form-model-item label="调拨退货类型">
+                <AllocateType id="transferReturnDetailReport-allocateReturnTypeSn" :changeOnSelect="true" v-model="allocateTypeVal" @change="changeAllocatype"></AllocateType>
+              </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="调拨退货对象类型">
+              <a-form-model-item label="调拨退货对象类型">
                 <v-select
                   code="TARGET_TYPE"
-                  id="allocateReturnDetailReport-argetType"
+                  id="transferReturnDetailReport-targetType"
                   v-model="queryParam.targetType"
                   allowClear
                   placeholder="请选择调拨退货对象类型"></v-select>
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="所在区域">
-                <subarea id="allocateReturnDetailReport-subareaSn" ref="subarea" @change="subareaChange"></subarea>
+                <subarea id="transferReturnDetailReport-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="所在省份">
-                <Area id="allocateReturnDetailReport-provinceSn" defValKey="id" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
+                <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="allocateReturnDetailReport-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+                <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="allocateReturnDetailReport-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
+                  <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="产品分类">
-                  <ProductType id="allocateReturnDetailReport-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
+                  <ProductType id="transferReturnDetailReport-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="产品名称">
-                  <a-input id="allocateReturnDetailReport-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+                  <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="产品编码">
-                  <a-input id="allocateReturnDetailReport-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+                  <a-input id="transferReturnDetailReport-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
                 </a-form-model-item>
               </a-col>
             </template>
             <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
-              <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="allocateReturnDetailReport-refresh">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="allocateReturnDetailReport-reset">重置</a-button>
+              <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="transferReturnDetailReport-refresh">查询</a-button>
+              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="transferReturnDetailReport-reset">重置</a-button>
               <a-button
                 style="margin-left: 10px"
                 type="primary"
@@ -90,7 +90,7 @@
                 :disabled="disabled"
                 :loading="exportLoading"
                 v-if="$hasPermissions('M_transferReturnDetailReportExport')"
-                id="allocateReturnDetailReport-export">导出</a-button>
+                id="transferReturnDetailReport-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -144,6 +144,8 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
+import { hdExportExcel } from '@/libs/exportExcel'
+// 组件
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
@@ -152,7 +154,7 @@ import AllocateType from '@/views/common/allocateType.js'
 import Area from '@/views/common/area.js'
 import ProductBrand from '@/views/common/productBrand.js'
 import ProductType from '@/views/common/productType.js'
-import { hdExportExcel } from '@/libs/exportExcel'
+// 接口
 import { allocateReturnReportDetailQueryPage, allocateReturnReportDetailQueryCount, allocateReturnReportDetailExport } from '@/api/reportData'
 export default {
   name: 'TransferReturnDetailReportList',
@@ -162,40 +164,41 @@ export default {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
-      showExport: false,
-      queryParam: { //  查询条件
+      tableHeight: 0, // 表格高度
+      showExport: false, // 导出弹窗
+      disabled: false, //  查询、重置按钮是否可操作
+      exportLoading: false, // 导出按钮加载状态
+      //  查询条件
+      queryParam: {
+        // 退货完成日期 默认日期
         time: [
           getDate.getCurrMonthDays().starttime,
           getDate.getCurrMonthDays().endtime
         ],
-        beginDate: getDate.getCurrMonthDays().starttime,
-        endDate: getDate.getCurrMonthDays().endtime,
-        allocateReturnNo: '',
-        productCode: '',
-        productName: '',
-        targetName: '',
-        costTypeSn: undefined,
-        allocateSortSn: undefined,
-        allocateReturnTypeSn: undefined,
-        targetType: undefined,
-        productBrandTypeSn: undefined,
+        beginDate: getDate.getCurrMonthDays().starttime, // 开始日期
+        endDate: getDate.getCurrMonthDays().endtime, // 结束日期
+        allocateReturnNo: '', // 调拨退货单号
+        productCode: '', // 产品编码
+        productName: '', // 产品名称
+        targetName: '', // 调拨退货对象名称
+        costTypeSn: undefined, // 调拨退货  成本类型
+        allocateSortSn: undefined, // 调拨退货类型
+        allocateReturnTypeSn: undefined, // 调拨退货类型 sn
+        targetType: undefined, // 调拨退货对象类型
+        productBrandTypeSn: undefined, // 品牌分类
         productBrandSn: undefined, //  产品品牌
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
         subareaArea: {
-          subareaSn: undefined,
-          subareaAreaSn: undefined
+          subareaSn: undefined, // 区域
+          subareaAreaSn: undefined// 分区
         },
-        provinceSn: undefined
+        provinceSn: undefined// 省份编码
       },
-      productType: [],
       rules: {
         'time': [{ required: true, message: '请选择退货完成日期', trigger: 'change' }]
       },
-      disabled: false, //  查询、重置按钮是否可操作
-      exportLoading: false,
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
@@ -216,11 +219,14 @@ export default {
           }
         })
         delete params.time
+        // 获取列表数据 有分页
         return allocateReturnReportDetailQueryPage(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
+            // 统计
             this.getCount(params)
+            // 计算列表序号
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
@@ -231,8 +237,9 @@ export default {
           return data
         })
       },
-      totalData: null,
-      allocateTypeVal: []
+      totalData: null, // 统计数据
+      productType: [], // 产品分类
+      allocateTypeVal: []// 调拨退货类型数据
     }
   },
   computed: {
@@ -269,6 +276,7 @@ export default {
     }
   },
   watch: {
+    // 展开关闭
     advanced (newValue, oldValue) {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
@@ -280,16 +288,13 @@ export default {
     }
   },
   methods: {
+    // 调拨退货类型 change
     changeAllocatype (val, opts) {
       this.allocateTypeVal = val || []
       this.queryParam.costTypeSn = val && val[0] ? val[0] : ''
       this.queryParam.allocateSortSn = val && val[1] ? val[1] : ''
       this.queryParam.allocateReturnTypeSn = val && val[2] ? val[2] : ''
     },
-    // 盘点库存日期
-    handleStock () {
-      this.$message.info('无盘点区间的起始/终止时间,请自行选择日期区间查询!')
-    },
     // 总计
     getCount (params) {
       allocateReturnReportDetailQueryCount(params).then(res => {
@@ -300,6 +305,7 @@ export default {
         }
       })
     },
+    // 查询
     handleSearch () {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
@@ -311,7 +317,7 @@ export default {
         }
       })
     },
-    //  创建时间  change
+    //  退货完成日期  change
     dateChange (date) {
       if (date[0] && date[1]) {
         this.queryParam.time = date
@@ -321,9 +327,7 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
-    custChange (val) {
-      this.queryParam.dealerSn = val.key
-    },
+    // 区域 change
     subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
@@ -391,6 +395,7 @@ export default {
       this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
       this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
     },
+    // 初始化
     pageInit () {
       const _this = this
       this.$nextTick(() => {
@@ -398,6 +403,7 @@ export default {
       })
       _this.resetSearchForm()
     },
+    // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 200

+ 47 - 38
src/views/reportData/transferReturnReport/list.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="allocateReturnReport-wrap searchBoxNormal">
+    <a-card size="small" :bordered="false" class="transferReturnReportList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
-          id="allocateReturnReport-form"
+          id="transferReturnReportList-form"
           ref="ruleForm"
           class="form-model-con"
           layout="inline"
@@ -14,34 +14,34 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="退货完成日期" prop="time">
-                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate ref="rangeDate" id="transferReturnReportList-time" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="调拨退货单号">
+              <a-form-model-item label="调拨退货单号">
                 <a-input id="transferReturnReportList-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo" allowClear placeholder="请输入调拨退货单号"/>
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="调拨退货对象名称">
+              <a-form-model-item label="调拨退货对象名称">
                 <a-input id="transferReturnReportList-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调拨退货对象名称"/>
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="调拨退货类型">
+                <a-form-model-item label="调拨退货类型">
                   <AllocateType id="transferReturnReportList-allocateReturnTypeSn" :changeOnSelect="true" v-model="allocateTypeVal" @change="changeAllocatype"></AllocateType>
-                </a-form-item>
+                </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="调拨退货对象类型">
+                <a-form-model-item label="调拨退货对象类型">
                   <v-select
                     code="TARGET_TYPE"
-                    id="transferReturnReportList-argetType"
+                    id="transferReturnReportList-targetType"
                     v-model="queryParam.targetType"
                     allowClear
                     placeholder="请选择调拨退货对象类型"></v-select>
-                </a-form-item>
+                </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
@@ -50,8 +50,8 @@
               </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-              <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="allocateReturnReport-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocateReturnReport-reset">重置</a-button>
+              <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="transferReturnReportList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="transferReturnReportList-reset">重置</a-button>
               <a-button
                 style="margin-left: 5px"
                 type="primary"
@@ -60,7 +60,7 @@
                 :disabled="disabled"
                 :loading="exportLoading"
                 v-if="$hasPermissions('M_transferReturnReportExport')"
-                id="allocateReturnReport-export">导出</a-button>
+                id="transferReturnReportList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -114,12 +114,14 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
+import { hdExportExcel } from '@/libs/exportExcel'
+// 组件
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import reportModal from '@/views/common/reportModal.vue'
 import AllocateType from '@/views/common/allocateType.js'
-import { hdExportExcel } from '@/libs/exportExcel'
+// 接口
 import { allocateReturnReportQueryPage, allocateReturnReportQueryCount, allocateReturnReportExport } from '@/api/reportData'
 export default {
   name: 'TransferReturnReportList',
@@ -128,43 +130,48 @@ export default {
   data () {
     return {
       spinning: false,
-      exportLoading: false,
+      exportLoading: false, // 导出按钮加载状态
       advanced: true, // 高级搜索 展开/关闭
-      tableHeight: 0,
-      showExport: false,
-      queryParam: { //  查询条件
+      tableHeight: 0, // 表格高度
+      showExport: false, // 导出弹窗
+      disabled: false, //  查询、重置按钮是否可操作
+      //  查询条件
+      queryParam: {
+        // 退货完成日期 默认值
         time: [
           getDate.getCurrMonthDays().starttime,
           getDate.getCurrMonthDays().endtime
         ],
-        beginDate: getDate.getCurrMonthDays().starttime,
-        endDate: getDate.getCurrMonthDays().endtime,
-        allocateReturnNo: '',
-        targetName: '',
-        costTypeSn: undefined,
-        allocateSortSn: undefined,
-        allocateReturnTypeSn: undefined,
-        targetType: undefined,
+        beginDate: getDate.getCurrMonthDays().starttime, // 开始日期
+        endDate: getDate.getCurrMonthDays().endtime, // 结束日期
+        allocateReturnNo: '', // 退货单号
+        targetName: '', // 调拨退货对象名称
+        costTypeSn: undefined, // 调拨退货  成本类型
+        allocateSortSn: undefined, // 调拨退货类型
+        allocateReturnTypeSn: undefined, // 调拨退货类型 sn
+        targetType: undefined, // 调拨退货对象类型
         subareaArea: {
-          subareaSn: undefined,
-          subareaAreaSn: undefined
+          subareaSn: undefined, // 区域
+          subareaAreaSn: undefined// 分区
         }
       },
       rules: {
         'time': [{ required: true, message: '请选择退货完成日期', trigger: 'change' }]
       },
-      disabled: false, //  查询、重置按钮是否可操作
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
         delete params.time
+        // 获取列表数据 有分页
         return allocateReturnReportQueryPage(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
+            // 统计
             this.getCount(params)
+            // 计算表格序号
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
@@ -175,8 +182,8 @@ export default {
           return data
         })
       },
-      totalData: null,
-      allocateTypeVal: []
+      totalData: null, // 统计数据
+      allocateTypeVal: []// 调拨退货类型数据
     }
   },
   computed: {
@@ -205,6 +212,7 @@ export default {
     }
   },
   watch: {
+    // 展开关闭
     advanced (newValue, oldValue) {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
@@ -216,6 +224,7 @@ export default {
     }
   },
   methods: {
+    // 调拨退货类型
     changeAllocatype (val, opts) {
       this.allocateTypeVal = val || []
       this.queryParam.costTypeSn = val && val[0] ? val[0] : ''
@@ -242,10 +251,6 @@ export default {
         }
       })
     },
-    // 盘点库存日期
-    handleStock () {
-      this.$message.info('无盘点区间的起始/终止时间,请自行选择日期区间查询!')
-    },
     // 总计
     getCount (params) {
       allocateReturnReportQueryCount(params).then(res => {
@@ -256,6 +261,7 @@ export default {
         }
       })
     },
+    // 查询
     handleSearch () {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
@@ -267,7 +273,7 @@ export default {
         }
       })
     },
-    //  创建时间  change
+    //  退货完成日期  change
     dateChange (date) {
       if (date[0] && date[1]) {
         this.queryParam.time = date
@@ -277,6 +283,7 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
+    // 区域分区 change
     subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
@@ -306,6 +313,7 @@ export default {
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()
     },
+    // 初始化
     pageInit () {
       const _this = this
       this.$nextTick(() => {
@@ -313,6 +321,7 @@ export default {
       })
       _this.resetSearchForm()
     },
+    // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 215

+ 11 - 9
src/views/reportData/urchaseDetailReturn/detailList.vue

@@ -4,7 +4,7 @@
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper" ref="tableSearch">
         <a-form-model
-          id="salesSlipReportList-form"
+          id="urchaseDetailReturn-form"
           ref="ruleForm"
           class="form-model-con"
           layout="inline"
@@ -14,23 +14,24 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="退货完成日期" prop="time">
-                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <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-item label="采购退货单号">
-                <a-input v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入采购退货单号"/>
+                <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 isPermission v-model="queryParam.supplier.supplierSn" @change="getSupplierName" placeholder="请输入供应商名称"></supplier>
+                <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-item label="退货原因">
                   <v-select
+                    id="urchaseDetailReturn-returnReason"
                     v-model="queryParam.returnReason"
                     ref="returnReason"
                     code="SPARE_PARTS_RETURN_REASON"
@@ -60,18 +61,18 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="出库仓库">
-                  <chooseWarehouse isPermission ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+                  <chooseWarehouse isPermission id="urchaseDetailReturn-warehouse" ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
-                  <AreaList id="salesSlipReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
+                  <AreaList id="urchaseDetailReturn-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                 </a-form-model-item>
               </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-              <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnDetailList-refresh">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="salesReturnDetailList-reset">重置</a-button>
+              <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="urchaseDetailReturn-refresh">查询</a-button>
+              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="urchaseDetailReturn-reset">重置</a-button>
               <a-button
                 style="margin-left: 10px"
                 type="primary"
@@ -80,7 +81,7 @@
                 :disabled="disabled"
                 :loading="exportLoading"
                 v-if="$hasPermissions('B_urchaseDetailReturn_export')"
-                id="salesReturnDetailList-export">导出</a-button>
+                id="urchaseDetailReturn-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -108,6 +109,7 @@
           <template slot="attachmentList" slot-scope="text, record">
             <span v-if="record.attachmentList && record.attachmentList.length > 0">
               <a
+                id="urchaseDetailReturn-link"
                 target="_blank"
                 style="color: #00aaff;text-decoration: underline;margin-right: 15px;"
                 :href="item.filePath"

+ 6 - 5
src/views/reportData/urchaseReturn/list.vue

@@ -14,22 +14,22 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="退货完成日期" prop="time">
-                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate ref="rangeDate" id="urchaseReturn-time" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="采购退货单号">
-                <a-input id="urchaseReturnList-productCode" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入采购退货单号"/>
+                <a-input id="urchaseReturnList-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 v-model="queryParam.supplierSn" isPermission placeholder="请输入供应商名称"></supplier>
+                <supplier id="urchaseReturnList-supplierSn" v-model="queryParam.supplierSn" isPermission placeholder="请输入供应商名称"></supplier>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="退货仓库">
-                <chooseWarehouse isPermission ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+                <chooseWarehouse id="urchaseReturnList-warehouse" isPermission ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -37,7 +37,7 @@
                 <v-select
                   v-model="queryParam.returnReason"
                   ref="returnReason"
-                  id="purchaseReturn-returnReason"
+                  id="urchaseReturnList-returnReason"
                   code="SPARE_PARTS_RETURN_REASON"
                   placeholder="请选择退货原因"
                   allowClear></v-select>
@@ -79,6 +79,7 @@
             <span v-if="record.attachmentList && record.attachmentList.length > 0">
               <a
                 target="_blank"
+                id="urchaseReturnList-link"
                 style="color: #00aaff;text-decoration: underline;margin-right: 15px;"
                 :href="item.filePath"
                 v-for="item in record.attachmentList"