Browse Source

连锁报表完善id

lilei 1 year ago
parent
commit
5c13a374c9

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1721099685048
+  "version": 1721114850301
 }

+ 8 - 7
src/views/chainReportData/chainCallReport/detailList.vue

@@ -15,12 +15,12 @@
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="审核时间" prop="time">
-              <rangeDate ref="rangeDate" @change="dateChange" />
+              <rangeDate id="chainCallReportExport-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="出库时间">
-              <rangeDate ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
+              <rangeDate id="chainCallReportExport-outTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -78,7 +78,7 @@
               v-if="$hasPermissions('M_chainCallReportExport')"
               class="button-warning"
               id="chainCallReportExport-export-btn">导出</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
+            <a @click="advanced=!advanced" style="margin-left: 5px" id="chainCallReportExport-advanced">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -144,10 +144,10 @@ export default {
           code: '', //  产品编码
           name: '' //  产品名称
         },
-        productType: undefined,
-        putTenantSn: undefined,
-        allocationType: undefined,
-        allocationLinkageOutNo: ''
+        productType: undefined, // 产品分类
+        putTenantSn: undefined, // 调往对象
+        allocationType: undefined, // 调拨产品类型
+        allocationLinkageOutNo: '' // 调出单号
       },
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
@@ -217,6 +217,7 @@ export default {
       this.queryParam.auditBeginDate = date[0] || ''
       this.queryParam.auditEndDate = date[1] || ''
     },
+    // 出库时间
     outWareDateChange (date) {
       this.queryParam.outWarehouseBeginDate = date[0]
       this.queryParam.outWarehouseEndDate = date[1]

+ 3 - 3
src/views/chainReportData/chainCallReport/index.vue

@@ -2,8 +2,8 @@
   <div class="tabsReportList-wrap">
     <div style="background-color: #fff;margin-bottom: 5px;">
       <a-tabs default-active-key="1" v-model="curTab">
-        <a-tab-pane key="1" tab="连锁调出报表"></a-tab-pane>
-        <a-tab-pane key="2" tab="连锁调出明细报表" force-render></a-tab-pane>
+        <a-tab-pane key="1" id="tab1" tab="连锁调出报表"></a-tab-pane>
+        <a-tab-pane key="2" id="tab2" tab="连锁调出明细报表" force-render></a-tab-pane>
       </a-tabs>
     </div>
     <a-card size="small" :bordered="false">
@@ -17,7 +17,7 @@
 import report from './list.vue'
 import detailReport from './detailList.vue'
 export default {
-  name: 'chainTransferReportIndex',
+  name: 'ChainTransferReportIndex',
   components: {
     report,
     detailReport

+ 9 - 8
src/views/chainReportData/chainCallReport/list.vue

@@ -15,12 +15,12 @@
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="审核时间" prop="time">
-              <rangeDate ref="rangeDate" @change="dateChange" />
+              <rangeDate id="chainCallReportExport-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="出库时间">
-              <rangeDate ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
+              <rangeDate id="chainCallReportExport-outWareTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -58,7 +58,7 @@
               v-if="$hasPermissions('M_chainCallReportExport')"
               class="button-warning"
               id="chainCallReportExport-export-btn">导出</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
+            <a @click="advanced=!advanced" style="margin-left: 5px" id="chainCallReportExport-advanced">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -110,13 +110,13 @@ export default {
       outWareTime: [],
       queryParam: { //  查询条件
         time: [],
-        auditBeginDate: '',
+        auditBeginDate: '', // 审核时间
         auditEndDate: '',
-        outWarehouseBeginDate: '',
+        outWarehouseBeginDate: '', // 出库时间
         outWarehouseEndDate: '',
-        putTenantSn: undefined,
-        allocationType: undefined,
-        allocationLinkageOutNo: ''
+        putTenantSn: undefined, // 调往对象
+        allocationType: undefined, // 调拨产品类型
+        allocationLinkageOutNo: '' // 连锁调出单号
       },
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
@@ -184,6 +184,7 @@ export default {
       this.queryParam.auditBeginDate = date[0] || ''
       this.queryParam.auditEndDate = date[1] || ''
     },
+    // 出库时间
     outWareDateChange (date) {
       this.queryParam.outWarehouseBeginDate = date[0]
       this.queryParam.outWarehouseEndDate = date[1]

+ 14 - 12
src/views/chainReportData/chainCustomerReport/list.vue

@@ -24,36 +24,36 @@
                   :showSearch="true"
                   option-filter-prop="children"
                   :filter-option="filterOption">
-                  <a-select-option v-for="item in linkageGroupData" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
+                  <a-select-option v-for="item in linkageGroupData" :id="item.dealerSn" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
                 </a-select>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="添加时间" prop="time">
-                <rangeDate ref="rangeDate" @change="dateChange" />
+                <rangeDate id="customerReportList-time" ref="rangeDate" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品分类">
-                <ProductType placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="productType"></ProductType>
+                <ProductType id="customerReportList-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="productType"></ProductType>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-item label="客户所在区">
-                  <AreaList changeOnSelect ref="areaList" @change="areaChange"></AreaList>
+                  <AreaList id="customerReportList-area" changeOnSelect ref="areaList" @change="areaChange"></AreaList>
                 </a-form-item>
               </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="客户类型">
-                  <custType v-model="queryParam.customerTypeSn" allowClear placeholder="请选择客户类型" style="max-width: 240px;"></custType>
+                  <custType id="customerReportList-custType" v-model="queryParam.customerTypeSn" allowClear placeholder="请选择客户类型" style="max-width: 240px;"></custType>
                 </a-form-item>
               </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="customerReportList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="customerReportList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px">
+              <a @click="advanced=!advanced" style="margin-left: 5px" id="customerReportList-advanced">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
@@ -106,10 +106,10 @@ export default {
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
-        tenantId: undefined,
-        time: [],
-        beginDate: '',
-        endDate: '',
+        tenantId: undefined, // 连锁店id
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
@@ -169,7 +169,7 @@ export default {
       addrCityList: [], //  市下拉
       addrDistrictList: [], //  区下拉
       productTypeList: [], //  分类下拉数据
-      linkageGroupData: []
+      linkageGroupData: [] // 连锁店列表
     }
   },
   computed: {
@@ -190,6 +190,7 @@ export default {
     }
   },
   methods: {
+    // 地区
     areaChange (val) {
       this.queryParam.provinceSn = val[0] ? val[0] : undefined
       this.queryParam.citySn = val[1] ? val[1] : undefined
@@ -237,13 +238,14 @@ export default {
       this.queryParam.countySn = undefined
       this.queryParam.customerTypeSn = undefined
       this.productType = []
-      if(this.advanced){
+      if (this.advanced) {
         this.$refs.areaList.clearData()
       }
       this.$refs.ruleForm.resetFields()
       this.totalData = null
       this.$refs.table.clearTable()
     },
+    // 连锁店筛选
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0

+ 2 - 2
src/views/chainReportData/chainPurchaseReceiptReport/list.vue

@@ -4,7 +4,7 @@
       <!-- 标签页 -->
       <a-tabs type="card" :default-active-key="nowKey" @change="handleTabChange" class="chainPurchaseReceiptReportList-tabs ">
         <a-tab-pane v-for="item in tabPaneData" :key="item.val">
-          <span slot="tab">{{ item.name }}</span>
+          <span slot="tab" :id="item.val">{{ item.name }}</span>
         </a-tab-pane>
       </a-tabs>
       <purchaseReceiptOrder v-show="nowKey=='1'" @spinning="spinningFun" />
@@ -27,7 +27,7 @@ export default {
         { name: '采购入库单报表', val: '1' },
         { name: '采购入库明细报表', val: '2' }
       ],
-      nowKey: '1'
+      nowKey: '1' // 当前tab
     }
   },
   methods: {

+ 13 - 12
src/views/chainReportData/chainPurchaseReceiptReport/purchaseReceiptDetail.vue

@@ -29,7 +29,7 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="财务审核时间" prop="time">
-              <rangeDate ref="rangeDate" @change="dateChange" />
+              <rangeDate id="chainPurchaseReceiptDetailList-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -66,7 +66,7 @@
               :loading="exportLoading"
               v-if="$hasPermissions('B_chainPurchaseReceiptReportExport')"
               id="chainPurchaseReceiptDetailList-export">导出</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
+            <a @click="advanced=!advanced" style="margin-left: 5px" id="chainPurchaseReceiptDetailList-advanced">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -114,17 +114,17 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       queryParam: { //  查询条件
-        tenantId: undefined,
-        time: [],
-        beginDate: '',
-        endDate: '',
+        tenantId: undefined, // 连锁店id
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
         productEntity: {
-          productBrandSn: undefined,
-          productTypeSn1: undefined,
-          productTypeSn2: undefined,
-          productTypeSn3: undefined,
-          code: '',
-          name: ''
+          productBrandSn: undefined, // 品牌
+          productTypeSn1: undefined, //  产品一级分类
+          productTypeSn2: undefined, //  产品二级分类
+          productTypeSn3: undefined, //  产品三级分类
+          code: '', // 编码
+          name: ''// 名称
         }
       },
       productType: [],
@@ -236,6 +236,7 @@ export default {
       this.totalData = null
       this.$refs.table.clearTable()
     },
+    // 连锁店筛选
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0

+ 5 - 4
src/views/chainReportData/chainPurchaseReceiptReport/purchaseReceiptOrder.vue

@@ -23,13 +23,13 @@
                 :showSearch="true"
                 option-filter-prop="children"
                 :filter-option="filterOption">
-                <a-select-option v-for="item in linkageGroupData" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
+                <a-select-option v-for="item in linkageGroupData" :id="item.dealerSn" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="财务审核时间" prop="time">
-              <rangeDate ref="rangeDate" @change="dateChange" />
+              <rangeDate id="chainPurchaseReceiptOrderList-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
@@ -87,7 +87,7 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       queryParam: { //  查询条件
-        tenantId: undefined,
+        tenantId: undefined, // 连锁店id
         time: [],
         beginDate: '',
         endDate: ''
@@ -149,7 +149,7 @@ export default {
         }
       },
       totalData: null, //  合计
-      linkageGroupData: []
+      linkageGroupData: [] // 连锁店列表
     }
   },
   methods: {
@@ -191,6 +191,7 @@ export default {
       this.totalData = null
       this.$refs.table.clearTable()
     },
+    // 连锁店筛选
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0

+ 13 - 6
src/views/chainReportData/chainReceivedSendStorageReport/list.vue

@@ -30,7 +30,13 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="日期" prop="auditDate">
-                <a-month-picker v-model="queryParam.auditDate" :allowClear="false" @change="onChange" :defaultValue="moment()" style="width: 100%;" />
+                <a-month-picker
+                  id="sendStorageReportList-auditDate"
+                  v-model="queryParam.auditDate"
+                  :allowClear="false"
+                  @change="onChange"
+                  :defaultValue="moment()"
+                  style="width: 100%;" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -67,7 +73,7 @@
                 :disabled="disabled"
                 :loading="exportLoading"
                 id="sendStorageReportList-export">导出</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px">
+              <a @click="advanced=!advanced" style="margin-left: 5px" id="sendStorageReportList-advanced">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
@@ -122,8 +128,8 @@ export default {
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
-        auditDate: moment().format('YYYY-MM'),
-        tenantId: undefined,
+        auditDate: moment().format('YYYY-MM'), // 审核时间,默认当前日期
+        tenantId: undefined, // 连锁店id
         productEntity: {
           code: '', //  产品编码
           name: '', //  产品名称
@@ -200,8 +206,8 @@ export default {
           })
         }
       },
-      productType: [],
-      linkageGroupData: [],
+      productType: [], // 产品分类
+      linkageGroupData: [], // 连锁店列表
       totalData: null // 合计
     }
   },
@@ -271,6 +277,7 @@ export default {
       this.queryParam.productEntity.productTypeSn2 = val[1] ? val[1] : ''
       this.queryParam.productEntity.productTypeSn3 = val[2] ? val[2] : ''
     },
+    // 连锁店筛选
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0

+ 24 - 21
src/views/chainReportData/chainSalesDetailReport/list.vue

@@ -24,13 +24,13 @@
                 :showSearch="true"
                 option-filter-prop="children"
                 :filter-option="filterOption">
-                <a-select-option v-for="item in linkageGroupData" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
+                <a-select-option v-for="item in linkageGroupData" :id="item.dealerSn" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="审核时间" prop="time">
-              <rangeDate ref="rangeDate" @change="dateChange" />
+              <rangeDate id="chainSalesDetailReportList-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -41,7 +41,7 @@
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-item label="客户类型">
-                <custType v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
+                <custType id="chainSalesDetailReportList-custType" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -101,14 +101,14 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="客户所在区">
-                <AreaList changeOnSelect ref="areaList" @change="areaChange"></AreaList>
+                <AreaList id="chainSalesDetailReportList-area" changeOnSelect ref="areaList" @change="areaChange"></AreaList>
               </a-form-item>
             </a-col>
           </template>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainSalesDetailReportList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainSalesDetailReportList-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
+            <a @click="advanced=!advanced" style="margin-left: 5px" id="chainSalesDetailReportList-advanced">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -167,17 +167,17 @@ export default {
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
-        tenantId: undefined,
-        time: [],
-        beginDate: '',
-        endDate: '',
-        buyerNameCurrent: undefined,
-        buyerSnCurrent: undefined,
-        salesTargetType: undefined,
+        tenantId: undefined, // 连锁店id
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        buyerNameCurrent: undefined, // 客户名称
+        buyerSnCurrent: undefined, // 客户sn
+        salesTargetType: undefined, // 客户类型
         provinceSn: undefined, //  省
         citySn: undefined, //  市
         countySn: undefined, //  区
-        settleStyleSn: undefined,
+        settleStyleSn: undefined, // 收款方式
         productEntity: {
           productBrandSn: undefined, //  产品品牌
           productTypeSn1: '', //  产品一级分类
@@ -186,11 +186,11 @@ export default {
           code: '', //  产品编码
           name: '' //  产品名称
         },
-        warehouseCascade: [],
-        warehouseSn: undefined,
-        warehouseLocationSn: undefined,
-        salesBillNo: '',
-        salesManName: ''
+        warehouseCascade: [], // 仓库数据
+        warehouseSn: undefined, // 选择的仓库
+        warehouseLocationSn: undefined, // 仓位
+        salesBillNo: '', // 销售单号
+        salesManName: ''// 业务员
       },
       rules: {
         'tenantId': [{ required: true, message: '请选择连锁店', trigger: 'change' }],
@@ -225,11 +225,11 @@ export default {
       addrProvinceList: [], //  省下拉
       addrCityList: [], //  市下拉
       addrDistrictList: [], //  区下拉
-      linkageGroupData: [],
+      linkageGroupData: [], // 连锁店下拉
       allocateTypeList: [], //  调拨类型
       custTypeList: [], //  客户类型 下拉数据
       productBrandList: [], //  品牌下拉数据
-      productType: [],
+      productType: [], // 产品分类值
       productTypeList: [], //  分类下拉数据
       warehouseCascadeData: [] //  仓库仓位
     }
@@ -272,6 +272,7 @@ export default {
         }
       })
     },
+    // 地区
     areaChange (val) {
       this.queryParam.provinceSn = val[0] ? val[0] : undefined
       this.queryParam.citySn = val[1] ? val[1] : undefined
@@ -294,6 +295,7 @@ export default {
         }
       })
     },
+    // 客户
     custSatelliteChange (v, row) {
       if (row && row.customerSn) {
         this.queryParam.buyerSnCurrent = row.customerSn
@@ -330,13 +332,14 @@ export default {
       this.queryParam.salesManName = ''
       this.productType = []
       this.$refs.custSatelliteList.resetForm()
-      if(this.advanced){
+      if (this.advanced) {
         this.$refs.areaList.clearData()
       }
       this.$refs.ruleForm.resetFields()
       this.totalData = null
       this.$refs.table.clearTable()
     },
+    // 连锁店筛选
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0

+ 11 - 9
src/views/chainReportData/chainSalesDetailsCountReport/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" @change="dateChange" />
+                <rangeDate id="chainSalesDetailsCountReportList-time" ref="rangeDate" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -29,12 +29,12 @@
                   :showSearch="true"
                   option-filter-prop="children"
                   :filter-option="filterOption">
-                  <a-select-option v-for="item in linkageGroupData" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
+                  <a-select-option v-for="item in linkageGroupData" :id="item.dealerSn" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
                 </a-select>
               </a-form-model-item>
             </a-col>
             <a-col :md="2" :sm="8" style="margin-top: 6px;">
-              <a-checkbox @change="onChange" :default-checked="queryParam.oosFlag">
+              <a-checkbox @change="onChange" :default-checked="queryParam.oosFlag" id="chainSalesDetailsCountReportList-oosFlag">
                 包含急件
               </a-checkbox>
             </a-col>
@@ -89,11 +89,11 @@ export default {
       wrapperCol: { span: 16 },
       tableHeight: 0,
       queryParam: { //  查询条件
-        tenantId: undefined,
+        tenantId: undefined, // 连锁店id
         time: [],
-        beginDate: '',
-        endDate: '',
-        oosFlag: true
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        oosFlag: true // 包含急件
       },
       rules: {
         'time': [{ required: true, message: '请选择审核日期', trigger: 'change' }]
@@ -171,11 +171,12 @@ export default {
           return data
         })
       },
-      linkageGroupData: [],
-      totalData: null
+      linkageGroupData: [], // 连锁店列表
+      totalData: null // 统计数据
     }
   },
   methods: {
+    // 是否包含急件
     onChange (e) {
       this.queryParam.oosFlag = e.target.checked
     },
@@ -240,6 +241,7 @@ export default {
         }
       })
     },
+    // 连锁店筛选
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0

+ 16 - 13
src/views/chainReportData/chainSalesReport/list.vue

@@ -24,13 +24,13 @@
                 :showSearch="true"
                 option-filter-prop="children"
                 :filter-option="filterOption">
-                <a-select-option v-for="item in linkageGroupData" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
+                <a-select-option v-for="item in linkageGroupData" :id="item.dealerSn" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="审核时间" prop="time">
-              <rangeDate ref="rangeDate" @change="dateChange" />
+              <rangeDate id="chainSalesReportList-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -41,7 +41,7 @@
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-item label="客户类型">
-                <custType v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
+                <custType id="chainSalesReportList-custType" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -67,14 +67,14 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="客户所在区">
-                <AreaList changeOnSelect ref="areaList" @change="areaChange"></AreaList>
+                <AreaList id="chainSalesReportList-area" changeOnSelect ref="areaList" @change="areaChange"></AreaList>
               </a-form-item>
             </a-col>
           </template>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainSalesReportList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainSalesReportList-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 8px">
+            <a @click="advanced=!advanced" style="margin-left: 8px" id="chainSalesReportList-advanced">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -131,18 +131,18 @@ export default {
       tableHeight: 0,
       queryParam: { //  查询条件
         tenantId: undefined,
-        time: [],
+        time: [], // 时间
         beginDate: '',
         endDate: '',
-        buyerNameCurrent: undefined,
+        buyerNameCurrent: undefined, // 客户
         buyerSnCurrent: undefined,
-        salesTargetType: undefined,
+        salesTargetType: undefined, // 客户类型
         provinceSn: undefined, //  省
         citySn: undefined, //  市
         countySn: undefined, //  区
-        settleStyleSn: undefined,
-        salesBillNo: '',
-        salesManName: ''
+        settleStyleSn: undefined, // 收款方式
+        salesBillNo: '', // 销售单号
+        salesManName: '' // 销售人员
       },
       rules: {
         'tenantId': [{ required: true, message: '请选择连锁店', trigger: 'change' }],
@@ -173,7 +173,7 @@ export default {
         })
       },
       totalData: null, //  合计
-      linkageGroupData: [],
+      linkageGroupData: [], // 连锁店下拉
       addrProvinceList: [], //  省下拉
       addrCityList: [], //  市下拉
       addrDistrictList: [], //  区下拉
@@ -207,6 +207,7 @@ export default {
     }
   },
   methods: {
+    // 地区
     areaChange (val) {
       this.queryParam.provinceSn = val[0] ? val[0] : undefined
       this.queryParam.citySn = val[1] ? val[1] : undefined
@@ -239,6 +240,7 @@ export default {
         }
       })
     },
+    // 客户
     custSatelliteChange (v, row) {
       if (row && row.customerSn) {
         this.queryParam.buyerSnCurrent = row.customerSn
@@ -265,13 +267,14 @@ export default {
       this.queryParam.salesBillNo = ''
       this.queryParam.salesManName = ''
       this.$refs.custSatelliteList.resetForm()
-      if(this.advanced){
+      if (this.advanced) {
         this.$refs.areaList.clearData()
       }
       this.$refs.ruleForm.resetFields()
       this.totalData = null
       this.$refs.table.clearTable()
     },
+    // 连锁店筛选
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0

+ 5 - 4
src/views/chainReportData/chainSalesReturnDetailReport/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" @change="dateChange" />
+                <rangeDate id="reportSalesReturnBillDetail-time" ref="rangeDate" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -29,7 +29,7 @@
                   :showSearch="true"
                   option-filter-prop="children"
                   :filter-option="filterOption">
-                  <a-select-option v-for="item in linkageGroupData" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
+                  <a-select-option v-for="item in linkageGroupData" :id="item.dealerSn" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
                 </a-select>
               </a-form-model-item>
             </a-col>
@@ -95,7 +95,7 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
       columns: [
-        { title: '序号', dataIndex: 'no', width: 50, align: 'center',fixed: 'left' },
+        { title: '序号', dataIndex: 'no', width: 50, align: 'center', fixed: 'left' },
         { title: '门店', dataIndex: 'salesTargetName', width: 150, align: 'left', customRender: function (text) { return text || '--' }, fixed: 'left' },
         {
           title: '所有品牌',
@@ -143,7 +143,7 @@ export default {
         { title: '皮带', dataIndex: 'pdAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '轮子', dataIndex: 'lzAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '其他', dataIndex: 'otherAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '合计', dataIndex: 'totalAmount', width: 100, align: 'right',fixed: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '合计', dataIndex: 'totalAmount', width: 100, align: 'right', fixed: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -231,6 +231,7 @@ export default {
         }
       })
     },
+    // 连锁店筛选
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0

+ 9 - 6
src/views/chainReportData/chainStockExpenditureReport/list.vue

@@ -24,13 +24,13 @@
                   :showSearch="true"
                   option-filter-prop="children"
                   :filter-option="filterOption">
-                  <a-select-option v-for="item in linkageGroupData" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
+                  <a-select-option v-for="item in linkageGroupData" :id="item.dealerSn" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
                 </a-select>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="出库完成时间" prop="time">
-                <rangeDate ref="rangeDate" @change="dateChange" />
+                <rangeDate id="chainStockExpenditureReportList-time" ref="rangeDate" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -109,9 +109,9 @@ export default {
       tableData: [], //  含总计数据
       loadData: [], //  不含总计数据
       listLoading: false,
-      chart1: null,
-      totalData: null,
-      linkageGroupData: []
+      chart1: null, // 图表
+      totalData: null, // 统计数据
+      linkageGroupData: [] // 连锁下拉
     }
   },
 
@@ -207,12 +207,12 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
+    // 查询
     handelSearch () {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           this.getList()
         } else {
-          console.log('error submit!!')
           return false
         }
       })
@@ -258,6 +258,7 @@ export default {
         this.spinning = false
       })
     },
+    // 图表初始化
     chartInit () {
       this.pieData = []
       if (this.loadData.length < 1) {
@@ -291,6 +292,7 @@ export default {
       this.totalData = null
       this.chartInit()
     },
+    // 连锁店筛选
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
@@ -311,6 +313,7 @@ export default {
         }
       })
     },
+    // 图表重置
     chartResize () {
       this.chart1.resize()
     },

+ 9 - 7
src/views/chainReportData/chainStockIncomeReport/list.vue

@@ -24,13 +24,13 @@
                   :showSearch="true"
                   option-filter-prop="children"
                   :filter-option="filterOption">
-                  <a-select-option v-for="item in linkageGroupData" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
+                  <a-select-option v-for="item in linkageGroupData" :id="item.dealerSn" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
                 </a-select>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="入库完成时间" prop="time">
-                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate id="chainStockIncomeReportList-time" ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -108,10 +108,10 @@ export default {
       pieColor: ['#00aaff', '#ffaa00', '#00aa00', '#ff55ff', '#1dc5d4', '#8465c7', '#00ffff'],
       tableData: [], //  含总计数据
       loadData: [], //  不含总计数据
-      listLoading: false,
-      chart1: null,
-      totalData: null,
-      linkageGroupData: []
+      listLoading: false, // loading
+      chart1: null, // 图表对象
+      totalData: null, // 统计
+      linkageGroupData: [] // 连锁店下拉
     }
   },
 
@@ -207,12 +207,12 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
+    // 查询
     handelSearch () {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           this.getList()
         } else {
-          console.log('error submit!!')
           return false
         }
       })
@@ -258,6 +258,7 @@ export default {
         this.spinning = false
       })
     },
+    // 图表初始化
     chartInit () {
       this.pieData = []
       if (this.loadData.length < 1) {
@@ -291,6 +292,7 @@ export default {
       this.totalData = null
       this.chartInit()
     },
+    // 连锁店筛选
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0

+ 2 - 2
src/views/chainReportData/chainStockReport/detailModal.vue

@@ -47,11 +47,11 @@ export default {
       type: Boolean,
       default: false
     },
-    productSn: {
+    productSn: { // 产品sn
       type: [Number, String],
       default: ''
     },
-    stockSn: {
+    stockSn: { // 库存sn
       type: [Number, String],
       default: ''
     }

+ 15 - 9
src/views/chainReportData/chainStockReport/list.vue

@@ -24,7 +24,7 @@
                   :showSearch="true"
                   option-filter-prop="children"
                   :filter-option="filterOption">
-                  <a-select-option v-for="item in linkageGroupData" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
+                  <a-select-option v-for="item in linkageGroupData" :id="item.dealerSn" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
                 </a-select>
               </a-form-model-item>
             </a-col>
@@ -94,7 +94,7 @@
                 :disabled="disabled"
                 :loading="exportLoading"
                 id="inventoryQueryList-export">导出</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
+              <a @click="advanced=!advanced" style="margin-left: 8px" id="chainStockReportList-advanced">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
@@ -128,7 +128,13 @@
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button size="small" type="link" class="button-success" @click="goDetail(record)" id="chainStockReportList-detail-btn">详情</a-button>
+          <a-button
+            :id="'chainStockReportList-detail-'+record.productSn+'-'+record.stockSn"
+            size="small"
+            type="link"
+            class="button-success"
+            @click="goDetail(record)"
+            id="chainStockReportList-detail-btn">详情</a-button>
         </template>
       </s-table>
     </a-spin>
@@ -157,7 +163,7 @@ export default {
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
-        tenantId: undefined,
+        tenantId: undefined, // 连锁店id
         productCode: '', //  产品编码
         productName: '', //  产品名称
         productOrigCode: '', //  原厂编码
@@ -208,7 +214,6 @@ export default {
               return data
             })
           } else {
-            console.log('=======未登录')
             const _this = this
             return new Promise(function (resolve, reject) {
               const data = {
@@ -238,14 +243,14 @@ export default {
           })
         }
       },
-      productType: [],
-      linkageGroupData: [],
+      productType: [], // 产品分类
+      linkageGroupData: [], // 连锁店下拉
       productBrandList: [], //  品牌下拉数据
       productTypeList: [], //  分类下拉数据
       allocateTypeList: [], //  调拨类型
       totalData: null, //  合计
-      productSn: '',
-      stockSn: '',
+      productSn: '', // 产品sn
+      stockSn: '', // 入库sn
       openModal: false //  弹框
     }
   },
@@ -385,6 +390,7 @@ export default {
       this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
       this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
     },
+    // 连锁店筛选
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0

+ 11 - 12
src/views/chainReportData/chainTransferReport/detailList.vue

@@ -15,7 +15,7 @@
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="入库时间" prop="time">
-              <rangeDate ref="rangeDate" @change="dateChange" />
+              <rangeDate id="chainTransferInReport-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -39,7 +39,7 @@
                 allowClear></v-select>
             </a-form-item>
           </a-col>
-          <template v-if="advanced"> 
+          <template v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
                 <a-input id="chainTransferInReport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
@@ -73,7 +73,7 @@
               v-if="$hasPermissions('M_chainTransferInReportExport')"
               class="button-warning"
               id="chainTransferInReport-export-btn">导出</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
+            <a @click="advanced=!advanced" style="margin-left: 5px" id="chainTransferInReport-advanced">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -124,11 +124,10 @@ export default {
       wrapperCol: { span: 16 },
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
-      outWareTime: [],
       queryParam: { //  查询条件
-        time:[],
-        beginDate: '',
-        endDate: '',
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
         productEntity: {
           productBrandSn: undefined, //  产品品牌
           productTypeSn1: '', //  产品一级分类
@@ -137,10 +136,10 @@ export default {
           code: '', //  产品编码
           name: '' //  产品名称
         },
-        productType: undefined,
-        outTenantSn:undefined,
-        allocationType: undefined,
-        allocationLinkagePutNo: ''
+        productType: undefined, // 产品分类值
+        outTenantSn: undefined, // 调出对象
+        allocationType: undefined, // 调拨产品类型
+        allocationLinkagePutNo: '' // 连锁调入单号
       },
       rules: {
         'time': [{ required: true, message: '请选择入库时间', trigger: 'change' }]
@@ -169,7 +168,7 @@ export default {
           return data
         })
       },
-      totalData: null, //  合计
+      totalData: null //  合计
     }
   },
   computed: {

+ 3 - 3
src/views/chainReportData/chainTransferReport/index.vue

@@ -2,8 +2,8 @@
   <div class="tabsReportList-wrap">
     <div style="background-color: #fff;margin-bottom: 5px;">
       <a-tabs default-active-key="1" v-model="curTab">
-        <a-tab-pane key="1" tab="连锁调入报表"></a-tab-pane>
-        <a-tab-pane key="2" tab="连锁调入明细报表" force-render></a-tab-pane>
+        <a-tab-pane key="1" id="tab1" tab="连锁调入报表"></a-tab-pane>
+        <a-tab-pane key="2" id="tab2" tab="连锁调入明细报表" force-render></a-tab-pane>
       </a-tabs>
     </div>
     <a-card size="small" :bordered="false">
@@ -17,7 +17,7 @@
 import report from './list.vue'
 import detailReport from './detailList.vue'
 export default {
-  name: 'chainTransferReportIndex',
+  name: 'ChainTransferReportIndex',
   components: {
     report,
     detailReport

+ 12 - 12
src/views/chainReportData/chainTransferReport/list.vue

@@ -15,7 +15,7 @@
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="入库时间" prop="time">
-              <rangeDate ref="rangeDate" @change="dateChange" />
+              <rangeDate id="chainTransferInReport-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -95,14 +95,14 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
+      tableHeight: 0, // 表格高度
       queryParam: { //  查询条件
-        time:[],
-        beginDate: '',
-        endDate: '',
-        outTenantSn:undefined,
-        allocationType: undefined,
-        allocationLinkagePutNo: ''
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        outTenantSn: undefined, // 调出对象
+        allocationType: undefined, // 调拨产品类型
+        allocationLinkagePutNo: '' // 连锁调入单号
       },
       rules: {
         'time': [{ required: true, message: '请选择入库时间', trigger: 'change' }]
@@ -131,8 +131,8 @@ export default {
           return data
         })
       },
-      totalData: null, //  合计
-      storeCallOutTypeList: [] //  调拨类型
+      totalData: null, // 合计
+      storeCallOutTypeList: [] // 调拨类型
     }
   },
   computed: {
@@ -148,7 +148,7 @@ export default {
         { title: '调拨产品类型', dataIndex: 'allocationTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(5, 0, { title: '成本', dataIndex: 'productTotalCost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ?  _this.toThousands(text) : '--') } })
+        arr.splice(5, 0, { title: '成本', dataIndex: 'productTotalCost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }
@@ -211,7 +211,7 @@ export default {
           return false
         }
       })
-    },
+    }
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用