Ver Fonte

报表完善id

lilei há 11 meses atrás
pai
commit
5134900de0
39 ficheiros alterados com 358 adições e 363 exclusões
  1. 1 1
      public/version.json
  2. 16 18
      src/views/reportData/bulkReturnReport/detailList.vue
  3. 2 2
      src/views/reportData/bulkReturnReport/index.vue
  4. 11 14
      src/views/reportData/bulkReturnReport/list.vue
  5. 11 12
      src/views/reportData/bulkWarehousingReport/detailList.vue
  6. 2 2
      src/views/reportData/bulkWarehousingReport/index.vue
  7. 12 12
      src/views/reportData/bulkWarehousingReport/list.vue
  8. 16 19
      src/views/reportData/customerReport/list.vue
  9. 6 9
      src/views/reportData/customerSalesDetailsReport/list.vue
  10. 19 19
      src/views/reportData/inventoryReport/inventoryDetail.vue
  11. 7 8
      src/views/reportData/inventoryReport/inventoryOrder.vue
  12. 1 1
      src/views/reportData/inventoryReport/list.vue
  13. 1 1
      src/views/reportData/purchaseReceiptReport/list.vue
  14. 12 12
      src/views/reportData/purchaseReceiptReport/purchaseReceiptDetail.vue
  15. 4 5
      src/views/reportData/purchaseReceiptReport/purchaseReceiptOrder.vue
  16. 3 2
      src/views/reportData/purchaseReturnReport/list.vue
  17. 19 18
      src/views/reportData/purchaseReturnReport/purchaseReturnDetail.vue
  18. 11 12
      src/views/reportData/purchaseReturnReport/purchaseReturnOrder.vue
  19. 6 7
      src/views/reportData/receivedSendStorageReport/list.vue
  20. 27 31
      src/views/reportData/salesDetailReport/list.vue
  21. 8 5
      src/views/reportData/salesOutofStockReport/list.vue
  22. 13 9
      src/views/reportData/salesRankingReport/list.vue
  23. 2 2
      src/views/reportData/salesReport/index.vue
  24. 28 35
      src/views/reportData/salesReport/list.vue
  25. 2 2
      src/views/reportData/salesReturnReport/detailList.vue
  26. 2 2
      src/views/reportData/salesReturnReport/index.vue
  27. 7 7
      src/views/reportData/salesReturnReport/list.vue
  28. 8 5
      src/views/reportData/stockExpenditureReport/list.vue
  29. 23 20
      src/views/reportData/stockImportReport/detailList.vue
  30. 2 2
      src/views/reportData/stockImportReport/index.vue
  31. 11 10
      src/views/reportData/stockImportReport/list.vue
  32. 7 5
      src/views/reportData/stockIncomeReport/list.vue
  33. 2 0
      src/views/reportData/storeReceivedSendStorageReport/list.vue
  34. 18 18
      src/views/reportData/storeTransferOutReport/detailList.vue
  35. 2 2
      src/views/reportData/storeTransferOutReport/index.vue
  36. 12 11
      src/views/reportData/storeTransferOutReport/list.vue
  37. 12 12
      src/views/reportData/urgentItemsOffsetReport/detailList.vue
  38. 3 3
      src/views/reportData/urgentItemsOffsetReport/index.vue
  39. 9 8
      src/views/reportData/urgentItemsOffsetReport/list.vue

+ 1 - 1
public/version.json

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

+ 16 - 18
src/views/reportData/bulkReturnReport/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="bulkInList-auditTime" 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="bulkInList-outWareTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -133,15 +133,13 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
-      outWareTime: [],
+      tableHeight: 0, // 表格高度
+      outWareTime: [], // 出库时间
       queryParam: { //  查询条件
-        time: [],
-        beginDate: '',
-        endDate: '',
-        salesTargetName: '',
-        sparePartsPutTypeSn: undefined,
-        supplierSn: undefined,
+        time: [], // 时间默认值
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        supplierSn: undefined, // 供应商sn
         productEntity: {
           productBrandSn: undefined, //  产品品牌
           productTypeSn1: '', //  产品一级分类
@@ -150,15 +148,15 @@ export default {
           code: '', //  产品编码
           name: '' //  产品名称
         },
-        productType: undefined,
-        sparePartsReturnNo: ''
+        productType: undefined, // 产品分类默认值
+        sparePartsReturnNo: '' // 散件退货单号
       },
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
       },
-      openPopid: '',
+      openPopid: '', // 提示弹框当前id
       disabled: false, //  查询、重置按钮是否可操作
-      exportLoading: false,
+      exportLoading: false, // 导出loading
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
@@ -187,6 +185,7 @@ export default {
     }
   },
   computed: {
+    // 子表格列
     costColumns () {
       const _this = this
       return [
@@ -196,6 +195,7 @@ export default {
         { title: '数量', dataIndex: 'outQty', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
     },
+    // 列定义
     columns () {
       const _this = this
       const arr = [
@@ -233,6 +233,7 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
+    // 出库时间
     outWareDateChange (date) {
       this.queryParam.outWarehouseBeginDate = date[0]
       this.queryParam.outWarehouseEndDate = date[1]
@@ -243,7 +244,6 @@ export default {
         if (valid) {
           this.$refs.table.refresh(true)
         } else {
-          console.log('error submit!!')
           return false
         }
       })
@@ -260,8 +260,6 @@ export default {
       this.queryParam.outWarehouseEndDate = ''
 
       this.queryParam.sparePartsReturnNo = ''
-      this.queryParam.salesTargetName = ''
-      this.queryParam.sparePartsPutTypeSn = undefined
       this.queryParam.supplierSn = undefined
       this.queryParam.productEntity.productBrandSn = undefined
       this.queryParam.productEntity.productTypeSn1 = ''
@@ -289,7 +287,6 @@ export default {
             _this.spinning = false
           })
         } else {
-          console.log('error submit!!')
           return false
         }
       })
@@ -300,6 +297,7 @@ export default {
       this.queryParam.productEntity.productTypeSn2 = val[1] ? val[1] : ''
       this.queryParam.productEntity.productTypeSn3 = val[2] ? val[2] : ''
     },
+    // 初始化页面
     pageInit () {
       this.disabled = false
       this.spinning = false

+ 2 - 2
src/views/reportData/bulkReturnReport/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" tab="散件退货报表" id="tab-1"></a-tab-pane>
+        <a-tab-pane key="2" tab="散件退货明细报表" id="tab-2" force-render></a-tab-pane>
       </a-tabs>
     </div>
     <a-card size="small" :bordered="false">

+ 11 - 14
src/views/reportData/bulkReturnReport/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="bulkReturn-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="bulkReturn-outWareTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
             </a-form-item>
           </a-col>
           <a-col :md="4" :sm="24">
@@ -94,14 +94,14 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
-      outWareTime: [],
+      tableHeight: 0, // 表格高度
+      outWareTime: [], // 出库时间
       queryParam: { //  查询条件
-        time: [],
-        beginDate: '',
-        endDate: '',
-        supplierSn: undefined,
-        sparePartsReturnNo: ''
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        supplierSn: undefined, // 供应商sn
+        sparePartsReturnNo: '' // 散件退货单号
       },
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
@@ -169,6 +169,7 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
+    // 出库时间
     outWareDateChange (date) {
       this.queryParam.outWarehouseBeginDate = date[0]
       this.queryParam.outWarehouseEndDate = date[1]
@@ -216,23 +217,19 @@ export default {
             _this.spinning = false
           })
         } else {
-          console.log('error submit!!')
           return false
         }
       })
-    },
-    pageInit () {}
+    }
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      this.pageInit()
       this.resetSearchForm()
     }
   },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
-      this.pageInit()
       this.resetSearchForm()
     }
   },

+ 11 - 12
src/views/reportData/bulkWarehousingReport/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="bulkInList-rangeDate" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -73,7 +73,7 @@
               v-if="$hasPermissions('M_bulkWarehousingReportExport')"
               class="button-warning"
               id="bulkInList-export-btn">导出</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
+            <a @click="advanced=!advanced" style="margin-left: 5px" id="bulkInList-advanced">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -123,14 +123,13 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
+      tableHeight: 0, // 表格高度
       queryParam: { //  查询条件
-        time: [],
-        beginDate: '',
-        endDate: '',
-        salesTargetName: '',
-        sparePartsType: undefined,
-        supplierSn: undefined,
+        time: [], // 时间默认值
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        sparePartsType: undefined, // 散件入库类型
+        supplierSn: undefined, // 供应商sn
         productEntity: {
           productBrandSn: undefined, //  产品品牌
           productTypeSn1: '', //  产品一级分类
@@ -139,9 +138,8 @@ export default {
           code: '', //  产品编码
           name: '' //  产品名称
         },
-        productType: undefined,
-        sparePartsPurchaseNo: '',
-        salesManName: ''
+        productType: undefined, // 产品分类默认值
+        sparePartsPurchaseNo: '' // 散件单号
       },
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
@@ -280,6 +278,7 @@ export default {
       this.queryParam.productEntity.productTypeSn2 = val[1] ? val[1] : ''
       this.queryParam.productEntity.productTypeSn3 = val[2] ? val[2] : ''
     },
+    // 页面初始化
     pageInit () {
       this.disabled = false
       this.spinning = false

+ 2 - 2
src/views/reportData/bulkWarehousingReport/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" tab="散件入库报表" id="tab1"></a-tab-pane>
+        <a-tab-pane key="2" tab="散件入库明细报表" id="tab2" force-render></a-tab-pane>
       </a-tabs>
     </div>
     <a-card size="small" :bordered="false">

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

@@ -15,7 +15,7 @@
         <a-row :gutter="15">
           <a-col :md="5" :sm="24">
             <a-form-model-item label="审核时间" prop="time">
-              <rangeDate ref="rangeDate" @change="dateChange" />
+              <rangeDate id="bulkIn-rangeDate" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="5" :sm="24">
@@ -36,7 +36,7 @@
             <a-col :md="5" :sm="24">
               <a-form-model-item label="散件入库类型">
                 <a-select id="bulkIn-sparePartsType" placeholder="请选择散件入库类型" allowClear v-model="queryParam.sparePartsType">
-                  <a-select-option v-for="item in sparePartsPutTypeList" :key="item.sparePartsPutTypeSn" :value="item.sparePartsPutTypeSn">{{ item.name }}</a-select-option>
+                  <a-select-option v-for="item in sparePartsPutTypeList" :id="'bulkIn-sparePartsType'+item.sparePartsPutTypeSn" :key="item.sparePartsPutTypeSn" :value="item.sparePartsPutTypeSn">{{ item.name }}</a-select-option>
                 </a-select>
               </a-form-model-item>
             </a-col>
@@ -102,21 +102,21 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       advanced: true, // 高级搜索 展开/关闭
-      tableHeight: 0,
+      tableHeight: 0, // 表格高度
       queryParam: { //  查询条件
-        time: [],
-        beginDate: '',
-        endDate: '',
-        sparePartsType: undefined,
-        supplierSn: undefined,
-        sparePartsPurchaseNo: '',
-        supplierName: ''
+        time: [], // 时间默认值
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        sparePartsType: undefined, // 散件入库类型
+        supplierSn: undefined, // 供应商sn
+        sparePartsPurchaseNo: '', // 散件单号
+        supplierName: '' // 供应商名称
       },
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
-      exportLoading: false,
+      exportLoading: false, // 导出loading
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
@@ -185,7 +185,6 @@ export default {
         if (valid) {
           this.$refs.table.refresh(true)
         } else {
-          console.log('error submit!!')
           return false
         }
       })
@@ -234,6 +233,7 @@ export default {
         }
       })
     },
+    // 初始化
     pageInit () {
       this.getSparePartsPutTypeList()
     }

+ 16 - 19
src/views/reportData/customerReport/list.vue

@@ -1,9 +1,9 @@
 <template>
-  <div class="jg-page-wrap customerReportList-wrap">
+  <div class="jg-page-wrap customerReport-wrap">
     <a-card size="small" :bordered="false" class="table-page-search-wrapper">
       <!-- 搜索条件 -->
       <a-form-model
-        id="customerReportList-form"
+        id="customerReport-form"
         ref="ruleForm"
         class="form-model-con"
         layout="inline"
@@ -15,35 +15,35 @@
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="添加时间" prop="time">
-              <rangeDate ref="rangeDate" @change="dateChange" />
+              <rangeDate id="customerReport-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="客户名称">
-              <custList id="chainSalesReportList-salesTargetName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
+              <custList id="customerReport-salesTargetName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="客户类型">
-              <custType v-model="queryParam.customerTypeSn" allowClear placeholder="请选择客户类型"></custType>
+              <custType id="customerReport-customerTypeSn" v-model="queryParam.customerTypeSn" allowClear placeholder="请选择客户类型"></custType>
             </a-form-item>
           </a-col>
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-item label="客户所在区">
-                <AreaList id="chainSalesReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
+                <AreaList id="customerReport-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品分类">
-                <ProductType id="chainSalesReportList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
+                <ProductType id="customerReport-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
               </a-form-model-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: 8px">
+            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="customerReport-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="customerReport-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 8px" id="customerReport-advanced">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -99,11 +99,11 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       advanced: true, // 高级搜索 展开/关闭
-      tableHeight: 0,
+      tableHeight: 0, // 表格高度
       queryParam: { //  查询条件
         time: [],
-        beginDate: '',
-        endDate: '',
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
@@ -114,7 +114,7 @@ export default {
         customerName: undefined,
         customerSn: undefined
       },
-      productType: [],
+      productType: [], // 产品分类默认值
       rules: {
         'time': [{ required: true, message: '请选择添加时间', trigger: 'change' }]
       },
@@ -182,6 +182,7 @@ export default {
     }
   },
   methods: {
+    // 客户所在区
     areaChange (val) {
       this.queryParam.provinceSn = val[0] ? val[0] : ''
       this.queryParam.citySn = val[1] ? val[1] : ''
@@ -203,6 +204,7 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
+    // 客户名称
     custSatelliteChange (v, row) {
       if (row && row.customerSn) {
         this.queryParam.customerSn = row.customerSn
@@ -247,11 +249,6 @@ export default {
       this.totalData = null
       this.$refs.table.clearTable()
     },
-    filterOption (input, option) {
-      return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      )
-    },
     //  产品分类  change
     changeProductType (val, opt) {
       this.queryParam.productTypeSn1 = val[0] ? val[0] : ''

+ 6 - 9
src/views/reportData/customerSalesDetailsReport/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="customerSalesDetailsReportList-time" ref="rangeDate" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -101,9 +101,9 @@ export default {
       queryParam: { //  查询条件
         buyerNameCurrent: undefined, // 客户名称
         buyerSnCurrent: undefined, // 客户sn
-        time: [],
-        beginDate: '',
-        endDate: ''
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
       },
       rules: {
         'time': [{ required: true, message: '请选择审核日期', trigger: 'change' }]
@@ -184,7 +184,6 @@ export default {
           return data
         })
       },
-      linkageGroupData: [],
       totalData: null // 合计
     }
   },
@@ -217,6 +216,7 @@ export default {
         }
       })
     },
+    // 客户名称
     custSatelliteChange (v, row) {
       if (row && row.customerSn) {
         this.queryParam.buyerSnCurrent = row.customerSn
@@ -256,19 +256,16 @@ export default {
           return false
         }
       })
-    },
-    pageInit () {}
+    }
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      this.pageInit()
       this.resetSearchForm()
     }
   },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
-      this.pageInit()
       this.resetSearchForm()
     }
   },

+ 19 - 19
src/views/reportData/inventoryReport/inventoryDetail.vue

@@ -15,35 +15,35 @@
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="财务审核时间" prop="time">
-              <rangeDate ref="rangeDate" @change="dateChange" />
+              <rangeDate id="inventoryDetail-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="产品编码">
-              <a-input id="productPricingList-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
-            </a-form-item>
+              <a-input id="inventoryDetail-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
+            </a-form-item><strong></strong>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="产品名称">
-              <a-input id="productPricingList-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
+              <a-input id="inventoryDetail-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
             </a-form-item>
           </a-col>
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
-                <ProductBrand id="productPricingList-productBrandSn" v-model="queryParam.productEntity.productBrandSn"></ProductBrand>
+                <ProductBrand id="inventoryDetail-productBrandSn" v-model="queryParam.productEntity.productBrandSn"></ProductBrand>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="产品分类">
-                <ProductType id="productPricingList-productType" @change="changeProductType" v-model="productType"></ProductType>
+                <ProductType id="inventoryDetail-productType" @change="changeProductType" v-model="productType"></ProductType>
               </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="inventoryReportList-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryReportList-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
+            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="inventoryDetail-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryDetail-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 5px" id="inventoryDetail-advanced">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -93,19 +93,19 @@ export default {
       tableHeight: 0,
       advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
-        time: [],
-        beginDate: '',
-        endDate: '',
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
         productEntity: {
-          name: '',
-          code: '',
-          productBrandSn: undefined,
-          productTypeSn1: '',
-          productTypeSn2: '',
-          productTypeSn3: ''
+          name: '', // 产品名称
+          code: '', // 产品编码
+          productBrandSn: undefined, // 品牌
+          productTypeSn1: '', // 分类1
+          productTypeSn2: '', // 分类2
+          productTypeSn3: ''// 分类3
         }
       },
-      productType: [],
+      productType: [], // 产品分类值
       rules: {
         'time': [{ required: true, message: '请选择财务审核时间', trigger: 'change' }]
       },

+ 7 - 8
src/views/reportData/inventoryReport/inventoryOrder.vue

@@ -3,7 +3,7 @@
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form-model
-        id="inventoryReportList-form"
+        id="inventoryOrder-form"
         ref="ruleForm"
         class="form-model-con"
         layout="inline"
@@ -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="inventoryOrder-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="inventoryReportList-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryReportList-reset">重置</a-button>
+            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="inventoryOrder-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryOrder-reset">重置</a-button>
           </a-col>
         </a-row>
       </a-form-model>
@@ -66,11 +66,10 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       queryParam: { //  查询条件
-        time: [],
-        beginDate: '',
-        endDate: ''
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: ''// 结束时间
       },
-      productType: [],
       rules: {
         'time': [{ required: true, message: '请选择财务审核时间', trigger: 'change' }]
       },

+ 1 - 1
src/views/reportData/inventoryReport/list.vue

@@ -4,7 +4,7 @@
     <div style="background-color: #fff;margin-bottom: 5px;">
       <a-tabs :default-active-key="nowKey" @change="handleTabChange" class="inventoryReportList-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>
     </div>

+ 1 - 1
src/views/reportData/purchaseReceiptReport/list.vue

@@ -4,7 +4,7 @@
       <!-- 标签页 -->
       <a-tabs :default-active-key="nowKey" @change="handleTabChange" class="purchaseReceiptReportList-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" />

+ 12 - 12
src/views/reportData/purchaseReceiptReport/purchaseReceiptDetail.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="purchaseReceiptDetailList-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -52,7 +52,7 @@
               :loading="exportLoading"
               v-if="$hasPermissions('B_purchaseReceiptReportExport')"
               id="purchaseReceiptDetailList-export">导出</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
+            <a @click="advanced=!advanced" style="margin-left: 5px" id="purchaseReceiptDetailList-advanced">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -100,19 +100,19 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       queryParam: { //  查询条件
-        time: [],
-        beginDate: '',
-        endDate: '',
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
         productEntity: {
-          productBrandSn: undefined,
-          productTypeSn1: undefined,
-          productTypeSn2: undefined,
-          productTypeSn3: undefined,
-          code: '',
-          name: ''
+          productBrandSn: undefined, // 品牌
+          productTypeSn1: undefined, // 分类1
+          productTypeSn2: undefined, // 分类2
+          productTypeSn3: undefined, // 分类3
+          code: '', // 编码
+          name: ''// 产品名称
         }
       },
-      productType: [],
+      productType: [], // 产品类型值
       rules: {
         'time': [{ required: true, message: '请选择财务审核时间', trigger: 'change' }]
       },

+ 4 - 5
src/views/reportData/purchaseReceiptReport/purchaseReceiptOrder.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="purchaseReceiptDetailList-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
@@ -73,11 +73,10 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       queryParam: { //  查询条件
-        time: [],
-        beginDate: '',
-        endDate: ''
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
       },
-      productType: [],
       rules: {
         'time': [{ required: true, message: '请选择财务审核时间', trigger: 'change' }]
       },

+ 3 - 2
src/views/reportData/purchaseReturnReport/list.vue

@@ -4,7 +4,7 @@
       <!-- 标签页 -->
       <a-tabs :default-active-key="nowKey" @change="handleTabChange" class="purchaseReturnReportList-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>
       <purchaseReturnOrder v-show="nowKey=='1'" @spinning="spinningFun" />
@@ -27,10 +27,11 @@ export default {
         { name: '采购退货单报表', val: '1' },
         { name: '采购退货明细报表', val: '2' }
       ],
-      nowKey: '1'
+      nowKey: '1' // 当前tab值
     }
   },
   methods: {
+    // 加载状态
     spinningFun (val) {
       this.spinning = val
     },

+ 19 - 18
src/views/reportData/purchaseReturnReport/purchaseReturnDetail.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="purchaseReturnOrderList-rangeDate" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="采购退货单号" prop="purchaseReturnNo">
-              <a-input v-model.trim="queryParam.purchaseReturnNo" allowClear placeholder="请输入采购退货单号"/>
+              <a-input id="purchaseReturnOrderList-purchaseReturnNo" v-model.trim="queryParam.purchaseReturnNo" allowClear placeholder="请输入采购退货单号"/>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -33,7 +33,7 @@
                 :showSearch="true"
                 option-filter-prop="children"
                 :filter-option="filterOption">
-                <a-select-option v-for="item in supplierList" :pyCode="item.pyCode" :key="item.purchaseTargetSn" :value="item.purchaseTargetSn">{{ item.purchaseTargetName }}</a-select-option>
+                <a-select-option v-for="item in supplierList" :pyCode="item.pyCode" :id="item.purchaseTargetSn" :key="item.purchaseTargetSn" :value="item.purchaseTargetSn">{{ item.purchaseTargetName }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
@@ -71,7 +71,7 @@
               :loading="exportLoading"
               v-if="$hasPermissions('B_purchaseReturnReportExport')"
               id="purchaseReceiptDetailList-export">导出</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
+            <a @click="advanced=!advanced" style="margin-left: 5px" id="purchaseReceiptDetailList-advanced">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -120,20 +120,20 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       queryParam: { //  查询条件
-        time: [],
-        beginDate: '',
-        endDate: '',
-        purchaseReturnNo: '',
-        productCode: undefined,
-        productName: undefined,
-        returnTargetSn: undefined,
-        productBrandSn: undefined,
-        productTypeSn1: undefined,
-        productTypeSn2: undefined,
-        productTypeSn3: undefined,
-        showCost: undefined
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        purchaseReturnNo: '', // 采购退货单号
+        productCode: undefined, // 产品编码
+        productName: undefined, // 产品名称
+        returnTargetSn: undefined, // 供应商
+        productBrandSn: undefined, // 产品品牌
+        productTypeSn1: undefined, // 产品分类1
+        productTypeSn2: undefined, // 产品分类2
+        productTypeSn3: undefined, // 产品分类3
+        showCost: undefined // 是否显示成本
       },
-      productType: [],
+      productType: [], // 产品分类
       rules: {
         'time': [{ required: true, message: '请选择出库时间', trigger: 'change' }]
       },
@@ -179,7 +179,7 @@ export default {
         }
       },
       totalData: null, //  合计
-      supplierList: null
+      supplierList: null // 供应商列表
     }
   },
   computed: {
@@ -203,6 +203,7 @@ export default {
     }
   },
   methods: {
+    // 供应商筛选
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0

+ 11 - 12
src/views/reportData/purchaseReturnReport/purchaseReturnOrder.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="purchaseReturnOrderList-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="采购退货单号" prop="purchaseReturnNo">
-              <a-input v-model.trim="queryParam.purchaseReturnNo" allowClear placeholder="请输入采购退货单号"/>
+              <a-input id="purchaseReturnOrderList-purchaseReturnNo" v-model.trim="queryParam.purchaseReturnNo" allowClear placeholder="请输入采购退货单号"/>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -33,7 +33,7 @@
                 :showSearch="true"
                 option-filter-prop="children"
                 :filter-option="filterOption">
-                <a-select-option v-for="item in supplierList" :pyCode="item.pyCode" :key="item.purchaseTargetSn" :value="item.purchaseTargetSn">{{ item.purchaseTargetName }}</a-select-option>
+                <a-select-option v-for="item in supplierList" :pyCode="item.pyCode" :id="item.purchaseTargetSn" :key="item.purchaseTargetSn" :value="item.purchaseTargetSn">{{ item.purchaseTargetName }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
@@ -50,7 +50,6 @@
               v-if="$hasPermissions('B_purchaseReturnReportExport')"
               id="purchaseReturnOrderList-export">导出</a-button>
           </a-col>
-
         </a-row>
       </a-form-model>
     </div>
@@ -93,12 +92,12 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       queryParam: { //  查询条件
-        time: [],
-        beginDate: '',
-        endDate: '',
-        purchaseReturnNo: undefined,
-        returnTargetSn: undefined,
-        showCost: undefined
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        purchaseReturnNo: undefined, // 采购退货单号
+        returnTargetSn: undefined, // 供应商
+        showCost: undefined // 是否显示成本
       },
       dataList: null, // 总单数
       rules: {
@@ -147,7 +146,7 @@ export default {
         }
       },
       totalData: null, //  合计
-      supplierList: null
+      supplierList: null // 供应商下拉列
     }
   },
   computed: {
@@ -169,6 +168,7 @@ export default {
     }
   },
   methods: {
+    // 供应商筛选
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
@@ -207,7 +207,6 @@ export default {
           this.queryParam.showCost = this.$hasPermissions('M_ShowAllCost') ? 1 : 0
           this.$refs.table.refresh(true)
         } else {
-          console.log('error submit!!')
           return false
         }
       })

+ 6 - 7
src/views/reportData/receivedSendStorageReport/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 id="receivedSendStorageReportList-time" ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -53,7 +53,7 @@
                 :disabled="disabled"
                 :loading="exportLoading"
                 id="receivedSendStorageReportList-export">导出</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px">
+              <a @click="advanced=!advanced" style="margin-left: 5px" id="receivedSendStorageReportList-advanced">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
@@ -107,14 +107,14 @@ export default {
       spinning: false,
       tableHeight: 0,
       queryParam: { //  查询条件
-        time: [
+        time: [ // 时间
           // getDate.getMonthDays(3).starttime,
           // getDate.getMonthDays(3).endtime
         ],
         // beginDate: getDate.getMonthDays(3).starttime,
         // endDate: getDate.getMonthDays(3).endtime,
-        beginDate: '',
-        endDate: '',
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
         productEntity: {
           code: '', //  产品编码
           name: '', //  产品名称
@@ -155,7 +155,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        console.log('loadData.parameter:', parameter)
         const params = Object.assign(parameter, this.queryParam)
         this.spinning = true
         if (this.queryParam.beginDate) {
@@ -190,7 +189,7 @@ export default {
           })
         }
       },
-      productType: [],
+      productType: [], // 产品分类
       totalData: {} // 合计
     }
   },

+ 27 - 31
src/views/reportData/salesDetailReport/list.vue

@@ -16,17 +16,17 @@
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="创建时间">
-              <rangeDate ref="creatDate" v-model="creatTime" @change="creatDateChange" />
+              <rangeDate id="salesDetailReportList-creatDate" ref="creatDate" v-model="creatTime" @change="creatDateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="审核时间">
-              <rangeDate ref="rangeDate" v-model="time" @change="dateChange" />
+              <rangeDate id="salesDetailReportList-rangeDate" ref="rangeDate" v-model="time" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="出库时间">
-              <rangeDate ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
+              <rangeDate id="salesDetailReportList-outWareTime" ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
             </a-form-item>
           </a-col>
           <template v-if="advanced">
@@ -37,7 +37,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="客户类型">
-                <custType v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
+                <custType id="salesDetailReportList-salesTarget" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -97,7 +97,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="客户所在区">
-                <AreaList changeOnSelect ref="areaList" @change="areaChange"></AreaList>
+                <AreaList id="salesDetailReportList-area" changeOnSelect ref="areaList" @change="areaChange"></AreaList>
               </a-form-item>
             </a-col>
           </template>
@@ -113,7 +113,7 @@
               v-if="$hasPermissions('B_salesDetailExport')"
               class="button-warning"
               id="salesDetailReportList-export-btn">导出</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
+            <a @click="advanced=!advanced" style="margin-left: 5px" id="salesDetailReportList-advanced">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -155,8 +155,6 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
-import { getArea } from '@/api/data'
-import { custTypeFindAllList } from '@/api/custType'
 import { warehouseCascadeList } from '@/api/warehouse'
 import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
@@ -174,21 +172,21 @@ export default {
       wrapperCol: { span: 16 },
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
-      outWareTime: [],
-      time: [],
-      creatTime: [],
+      outWareTime: [], // 出库时间
+      time: [], // 审核时间
+      creatTime: [], // 创建时间
       queryParam: { //  查询条件
-        createBeginDate: '',
-        createEndDate: '',
-        beginDate: '',
-        endDate: '',
+        createBeginDate: '', // 创建开始时间
+        createEndDate: '', // 创建结束时间
+        beginDate: '', // 审核时间开始
+        endDate: '', // 审核时间结束
         buyerNameCurrent: undefined, // 客户名称
         buyerSnCurrent: undefined, // 客户sn
-        salesTargetType: undefined,
+        salesTargetType: undefined, // 客户类型
         provinceSn: undefined, //  省
         citySn: undefined, //  市
         countySn: undefined, //  区
-        settleStyleSn: undefined,
+        settleStyleSn: undefined, // 收款方式
         productEntity: {
           productBrandSn: undefined, //  产品品牌
           productTypeSn1: '', //  产品一级分类
@@ -197,11 +195,11 @@ export default {
           code: '', //  产品编码
           name: '' //  产品名称
         },
-        warehouseCascade: [],
-        warehouseSn: undefined,
-        warehouseLocationSn: undefined,
-        salesBillNo: '',
-        salesManName: ''
+        warehouseCascade: [], // 仓库仓位列表
+        warehouseSn: undefined, //  仓库
+        warehouseLocationSn: undefined, // 仓位
+        salesBillNo: '', // 销售单号
+        salesManName: '' // 销售员
       },
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
@@ -238,9 +236,8 @@ export default {
       addrProvinceList: [], //  省下拉
       addrCityList: [], //  市下拉
       addrDistrictList: [], //  区下拉
-      linkageGroupData: [],
       allocateTypeList: [], //  调拨类型
-      productType: [],
+      productType: [], // 产品分类
       warehouseCascadeData: [] //  仓库仓位
     }
   },
@@ -284,17 +281,19 @@ export default {
         }
       })
     },
+    // 创建时间
     creatDateChange (date) {
       this.creatTime = date
       this.queryParam.createBeginDate = date[0] || ''
       this.queryParam.createEndDate = date[1] || ''
     },
-    //  创建时间  change
+    //  审核时间  change
     dateChange (date) {
       this.time = date
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
+    // 出库时间
     outWareDateChange (date) {
       this.outWareTime = date
       this.queryParam.outWarehouseBeginDate = date[0]
@@ -305,13 +304,13 @@ export default {
       const str = JSON.stringify(this.queryParam)
       const ret = str.replace(/\[|\]/g, '"').replace(/"},"/g, '","').replace(/"}/g, '","').match(/"\:".*?","/g)
       const ret1 = ret.filter(item => item != '":"","')
-      console.log(ret1)
       if (ret1.length) {
         this.$refs.table.refresh(true)
       } else {
         this.$message.info('请至少输入一个查询条件')
       }
     },
+    // 客户名称
     custSatelliteChange (v, row) {
       if (row && row.customerSn) {
         this.queryParam.buyerSnCurrent = row.customerSn
@@ -321,6 +320,7 @@ export default {
         this.queryParam.buyerSnCurrent = undefined
       }
     },
+    // 所在分区
     areaChange (val) {
       this.queryParam.provinceSn = val[0] ? val[0] : undefined
       this.queryParam.citySn = val[1] ? val[1] : undefined
@@ -390,11 +390,6 @@ export default {
         this.$message.info('请至少输入一个查询条件')
       }
     },
-    filterOption (input, option) {
-      return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      )
-    },
     //  产品分类  change
     changeProductType (val, opt) {
       this.queryParam.productEntity.productTypeSn1 = val[0] ? val[0] : ''
@@ -429,6 +424,7 @@ export default {
         this.queryParam.warehouseLocationSn = ''
       }
     },
+    // 初始化页面
     pageInit () {
       this.disabled = false
       this.spinning = false

+ 8 - 5
src/views/reportData/salesOutofStockReport/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="salesOutofStockReport-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -56,6 +56,7 @@
             type="link"
             class="button-success"
             v-if="$hasPermissions('B_isSalesOosDetail')"
+            :id="'salesOutofStockReport-detail-'+record.id"
             @click="handleDetail(record)"
           >详情</a-button>
           <span v-else>--</span>
@@ -85,15 +86,15 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       queryParam: { //  查询条件
-        time: [],
-        beginDate: '',
-        endDate: '',
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
         targetName: undefined, // 客户名称
         targetSn: undefined // 客户sn
       },
       openDetailModal: false, // 详情弹窗
       disabled: false, //  查询、重置按钮是否可操作
-      exportLoading: false,
+      exportLoading: false, // 导出loading
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
@@ -120,6 +121,7 @@ export default {
     }
   },
   computed: {
+    // 列
     columns () {
       const _this = this
       const arr = [
@@ -161,6 +163,7 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
+    // 客户名称
     custSatelliteChange (v, row) {
       if (row && row.customerSn) {
         this.queryParam.targetSn = row.dealerSn

+ 13 - 9
src/views/reportData/salesRankingReport/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="salesDetailReportList-rangeDate" ref="rangeDate" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -53,7 +53,7 @@
                 v-if="$hasPermissions('B_salesRankingReportExport')"
                 class="button-warning"
                 id="salesDetailReportList-export-btn">导出</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
+              <a @click="advanced=!advanced" style="margin-left: 8px" id="salesDetailReportList-advanced">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
@@ -84,6 +84,7 @@
               size="small"
               v-model="showCols"
               style="min-width: 200px"
+              id="salesDetailReportList-showMore"
               dropdownMatchSelectWidth
               :maxTagCount="3"
               :tree-data="colsArr"
@@ -138,6 +139,7 @@
           <template slot="action" slot-scope="text, record">
             <a-button
               v-if="record.sysFlag==1&&$hasPermissions('B_salesRankingAddCar')"
+              :id="'salesDetailReportList-car-'+record.no"
               size="small"
               type="link"
               class="button-primary"
@@ -170,17 +172,17 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       advanced: true, // 高级搜索 展开/关闭
-      tableHeight: 0,
+      tableHeight: 0, // 表格高度
       queryParam: { //  查询条件
-        time: [],
-        beginDate: '',
-        endDate: '',
-        productBrandSn: undefined,
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        productBrandSn: undefined, // 品牌
         productTypeSn1: undefined, //  产品一级分类
         productTypeSn2: undefined, //  产品二级分类
         productTypeSn3: undefined, //  产品三级分类
-        productCode: undefined,
-        productName: undefined
+        productCode: undefined, // 产品编码
+        productName: undefined// 产品名称
       },
       productType: [], // 产品分类
       rules: {
@@ -326,6 +328,7 @@ export default {
       this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
       this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
     },
+    // 导出
     handleExport () {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
@@ -366,6 +369,7 @@ export default {
         this.spinning = false
       })
     },
+    // 表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 255

+ 2 - 2
src/views/reportData/salesReport/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="销售报表" v-if="$hasPermissions('M_salesReportList')"></a-tab-pane>
-        <a-tab-pane key="2" tab="销售明细报表" v-if="$hasPermissions('M_salesDetailReportList')" force-render></a-tab-pane>
+        <a-tab-pane key="1" tab="销售报表" id="tab1" v-if="$hasPermissions('M_salesReportList')"></a-tab-pane>
+        <a-tab-pane key="2" tab="销售明细报表" id="tab2" v-if="$hasPermissions('M_salesDetailReportList')" force-render></a-tab-pane>
       </a-tabs>
     </div>
     <a-card size="small" :bordered="false">

+ 28 - 35
src/views/reportData/salesReport/list.vue

@@ -16,17 +16,17 @@
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="创建时间">
-              <rangeDate ref="creatDate" v-model="creatTime" @change="creatDateChange" />
+              <rangeDate id="salesReportList-creatDate" ref="creatDate" v-model="creatTime" @change="creatDateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="审核时间">
-              <rangeDate ref="rangeDate" v-model="time" @change="dateChange" />
+              <rangeDate id="salesReportList-rangeDate" ref="rangeDate" v-model="time" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="出库时间">
-              <rangeDate ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
+              <rangeDate id="salesReportList-outWareTime" ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
             </a-form-item>
           </a-col>
           <template v-if="advanced">
@@ -36,10 +36,10 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-                <a-form-item label="客户类型">
-                  <custType v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
-                </a-form-item>
-              </a-col>
+              <a-form-item label="客户类型">
+                <custType id="salesReportList-salesTargetType" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="收款方式">
                 <v-select
@@ -62,10 +62,10 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-                <a-form-item label="客户所在区">
-                  <AreaList changeOnSelect ref="areaList" @change="areaChange"></AreaList>
-                </a-form-item>
-              </a-col>
+              <a-form-item label="客户所在区">
+                <AreaList id="salesReportList-areaList" 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="salesReportList-refresh">查询</a-button>
@@ -79,7 +79,7 @@
               v-if="$hasPermissions('B_salesReportExport')"
               class="button-warning"
               id="salesReportList-export-btn">导出</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
+            <a @click="advanced=!advanced" style="margin-left: 5px" id="salesReportList-advanced">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -122,7 +122,6 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
-import { getArea } from '@/api/data'
 import custType from '@/views/common/custType.js'
 import AreaList from '@/views/common/areaList.js'
 import custList from '@/views/common/custList.vue'
@@ -138,12 +137,12 @@ export default {
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
-        createBeginDate: '',
-        createEndDate: '',
-        beginDate: '',
-        endDate: '',
-        outWarehouseBeginDate: '',
-        outWarehouseEndDate: '',
+        createBeginDate: '', // 创建开始时间
+        createEndDate: '', // 创建结束时间
+        beginDate: '', // 审核开始时间
+        endDate: '', // 审核结束时间
+        outWarehouseBeginDate: '', // 出库开始时间
+        outWarehouseEndDate: '', // 出库结束时间
         buyerNameCurrent: undefined, // 客户名称
         buyerSnCurrent: undefined, // 客户sn
         salesTargetType: undefined, // 客户类型
@@ -151,12 +150,12 @@ export default {
         citySn: undefined, //  市
         countySn: undefined, //  区
         settleStyleSn: undefined,
-        salesBillNo: '',
-        salesManName: ''
+        salesBillNo: '', // 销售单号
+        salesManName: '' // 销售人员
       },
-      creatTime: [],
-      time: [],
-      outWareTime: [],
+      creatTime: [], // 创建时间
+      time: [], // 审核时间
+      outWareTime: [], // 出库时间
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
       },
@@ -185,7 +184,6 @@ export default {
         })
       },
       totalData: null, //  合计
-      linkageGroupData: [],
       addrProvinceList: [], //  省下拉
       addrCityList: [], //  市下拉
       addrDistrictList: [], //  区下拉
@@ -219,6 +217,7 @@ export default {
     }
   },
   methods: {
+    // 所在区域
     areaChange (val) {
       this.queryParam.provinceSn = val[0] ? val[0] : undefined
       this.queryParam.citySn = val[1] ? val[1] : undefined
@@ -234,6 +233,7 @@ export default {
         }
       })
     },
+    // 创建时间
     creatDateChange (date) {
       this.creatTime = date
       this.queryParam.createBeginDate = date[0] || ''
@@ -245,6 +245,7 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
+    // 出库时间
     outWareDateChange (date) {
       this.outWareTime = date
       this.queryParam.outWarehouseBeginDate = date[0]
@@ -265,6 +266,7 @@ export default {
         this.$message.info('请至少输入一个查询条件')
       }
     },
+    // 客户名称
     custSatelliteChange (v, row) {
       if (row && row.customerSn) {
         this.queryParam.buyerSnCurrent = row.customerSn
@@ -295,7 +297,7 @@ export default {
       this.queryParam.provinceSn = undefined
       this.queryParam.citySn = undefined
       this.queryParam.countySn = undefined
-      
+
       this.queryParam.settleStyleSn = undefined
       this.queryParam.showCost = undefined
       this.queryParam.salesBillNo = ''
@@ -332,25 +334,16 @@ export default {
       } else {
         this.$message.info('请至少输入一个查询条件')
       }
-    },
-    filterOption (input, option) {
-      return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      )
-    },
-    pageInit () {
     }
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      this.pageInit()
       this.resetSearchForm()
     }
   },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
-      this.pageInit()
       this.resetSearchForm()
     }
   },

+ 2 - 2
src/views/reportData/salesReturnReport/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="salesDetailReportList-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -62,7 +62,7 @@
               v-if="$hasPermissions('M_salesReturnReportExport')"
               class="button-warning"
               id="salesDetailReportList-export-btn">导出</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
+            <a @click="advanced=!advanced" style="margin-left: 5px" id="salesDetailReportList-advanced">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>

+ 2 - 2
src/views/reportData/salesReturnReport/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">

+ 7 - 7
src/views/reportData/salesReturnReport/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="salesReturnReportList-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -89,14 +89,14 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
+      tableHeight: 0, // 表格高度
       queryParam: { //  查询条件
-        time: [],
-        beginDate: '',
-        endDate: '',
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
         buyerNameCurrent: undefined, // 客户名称
         buyerSnCurrent: undefined, // 客户sn
-        salesReturnNo: ''
+        salesReturnNo: '' // 销售退货单号
       },
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
@@ -180,6 +180,7 @@ export default {
         }
       })
     },
+    // 客户名称
     custSatelliteChange (v, row) {
       if (row && row.customerSn) {
         this.queryParam.buyerSnCurrent = row.customerSn
@@ -218,7 +219,6 @@ export default {
             _this.spinning = false
           })
         } else {
-          console.log('error submit!!')
           return false
         }
       })

+ 8 - 5
src/views/reportData/stockExpenditureReport/list.vue

@@ -16,7 +16,7 @@
           <a-row :gutter="15">
             <a-col :md="8" :sm="24">
               <a-form-model-item label="出库完成时间" prop="time">
-                <rangeDate ref="rangeDate" @change="dateChange" />
+                <rangeDate id="stockExpenditureReportList-time" ref="rangeDate" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -91,9 +91,9 @@ export default {
       pieColor: ['#00aaff', '#ffaa00', '#00aa00', '#ff55ff', '#1dc5d4', '#8465c7', '#00ffff'],
       tableData: [], //  含总计数据
       loadData: [], //  不含总计数据
-      listLoading: false,
-      chart1: null,
-      totalData: null
+      listLoading: false, // 加载loading
+      chart1: null, // 图表对象
+      totalData: null // 统计数据
     }
   },
 
@@ -189,12 +189,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
         }
       })
@@ -239,6 +239,7 @@ export default {
         this.spinning = false
       })
     },
+    // 初始化图表
     chartInit () {
       this.pieData = []
       if (this.loadData.length < 1) {
@@ -271,6 +272,7 @@ export default {
       this.totalData = null
       this.chartInit()
     },
+    // 重置图表尺寸
     chartResize () {
       this.chart1.resize()
     }
@@ -281,6 +283,7 @@ export default {
     }
   },
   activated () {
+    // 重置图表,监听窗口变化
     on(window, 'resize', this.chartResize)
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {

+ 23 - 20
src/views/reportData/stockImportReport/detailList.vue

@@ -15,7 +15,7 @@
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="导入单号">
-              <a-input v-model.trim="queryParam.stockImportNo" allowClear placeholder="请输入导入单号"/>
+              <a-input id="stockImport-stockImportNo" v-model.trim="queryParam.stockImportNo" allowClear placeholder="请输入导入单号"/>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -23,11 +23,12 @@
               <a-select
                 placeholder="请选择导入类型"
                 v-model="queryParam.importType"
+                id="stockImport-importType"
                 allowClear>
-                <a-select-option value="STOCK_IMPORT">
+                <a-select-option value="STOCK_IMPORT" id="stockImport-importType1">
                   库存导入
                 </a-select-option>
-                <a-select-option value="SPARE_PARTS_IMPORT">
+                <a-select-option value="SPARE_PARTS_IMPORT" id="stockImport-importType2">
                   散件导入
                 </a-select-option>
               </a-select>
@@ -36,6 +37,7 @@
           <a-col :md="6" :sm="24">
             <a-form-model-item label="供应商">
               <supplier
+                id="stockImport-supplier"
                 v-model="supplierSn"
                 placeholder="请选择供应商"
                 @change="supplierChange"
@@ -44,34 +46,34 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="产品编码">
-              <a-input v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
+              <a-input id="stockImport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
             </a-form-model-item>
           </a-col>
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品名称">
-                <a-input v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
+                <a-input id="stockImport-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
-                <ProductBrand placeholder="请选择产品品牌" v-model="queryParam.productEntity.productBrandSn"></ProductBrand>
+                <ProductBrand id="stockImport-productBrand" placeholder="请选择产品品牌" v-model="queryParam.productEntity.productBrandSn"></ProductBrand>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品分类">
-                <ProductType placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="queryParam.productType"></ProductType>
+                <ProductType id="stockImport-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="queryParam.productType"></ProductType>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="导入时间">
-                <rangeDate ref="rangeDate" @change="dateChange" />
+                <rangeDate id="stockImport-rangeDate" ref="rangeDate" @change="dateChange" />
               </a-form-model-item>
             </a-col>
           </template>
           <a-col :md="24" :sm="24" style="text-align:center;margin-bottom: 10px;">
-            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesDetailReportList-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesDetailReportList-reset">重置</a-button>
+            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="stockImport-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="stockImport-reset">重置</a-button>
             <a-button
               type="primary"
               style="margin-left: 5px"
@@ -80,8 +82,8 @@
               :loading="exportLoading"
               v-if="$hasPermissions('B_StockImportDetailExport')"
               class="button-warning"
-              id="salesDetailReportList-export-btn">导出</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
+              id="stockImport-export-btn">导出</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 5px" id="stockImport-advanced-btn">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -134,11 +136,11 @@ export default {
       tableHeight: 0,
       supplierSn: undefined,
       queryParam: { //  查询条件
-        time: [],
-        beginDate: '',
-        endDate: '',
-        productType: undefined,
-        importType: undefined,
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        productType: undefined, // 产品分类值
+        importType: undefined, // 导入类型
         productEntity: {
           productBrandSn: undefined, //  产品品牌
           productTypeSn1: '', //  产品一级分类
@@ -147,8 +149,8 @@ export default {
           code: '', //  产品编码
           name: '' //  产品名称
         },
-        stockImportNo: '',
-        supplierName: ''
+        stockImportNo: '', // 导入单号
+        supplierName: '' // 供应商名称
       },
       rules: {
         'time': [{ required: true, message: '请选择导入时间', trigger: 'change' }]
@@ -205,6 +207,7 @@ export default {
     }
   },
   methods: {
+    // 选择供应商
     supplierChange (val, row) {
       this.queryParam.supplierName = row ? row.supplierName : ''
     },
@@ -274,7 +277,6 @@ export default {
             _this.spinning = false
           })
         } else {
-          console.log('error submit!!')
           return false
         }
       })
@@ -285,6 +287,7 @@ export default {
       this.queryParam.productEntity.productTypeSn2 = val[1] ? val[1] : ''
       this.queryParam.productEntity.productTypeSn3 = val[2] ? val[2] : ''
     },
+    // 初始化页面
     pageInit () {
       this.disabled = false
       this.spinning = false

+ 2 - 2
src/views/reportData/stockImportReport/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">

+ 11 - 10
src/views/reportData/stockImportReport/list.vue

@@ -3,7 +3,7 @@
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form-model
-        id="salesReturnReportList-form"
+        id="stockImport-form"
         ref="ruleForm"
         class="form-model-con"
         layout="inline"
@@ -18,11 +18,12 @@
               <a-select
                 placeholder="请选择导入类型"
                 v-model="queryParam.importType"
+                id="stockImport-importType"
                 allowClear>
-                <a-select-option value="STOCK_IMPORT">
+                <a-select-option value="STOCK_IMPORT" id="stockImport-importType0">
                   库存导入
                 </a-select-option>
-                <a-select-option value="SPARE_PARTS_IMPORT">
+                <a-select-option value="SPARE_PARTS_IMPORT" id="stockImport-importType1">
                   散件导入
                 </a-select-option>
               </a-select>
@@ -30,12 +31,12 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="导入时间">
-              <rangeDate ref="rangeDate" @change="dateChange" />
+              <rangeDate ref="rangeDate" @change="dateChange" id="stockImport-rangeDate"/>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnReportList-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesReturnReportList-reset">重置</a-button>
+            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="stockImport-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="stockImport-reset">重置</a-button>
           </a-col>
         </a-row>
       </a-form-model>
@@ -81,10 +82,10 @@ export default {
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
-        time: [],
-        beginDate: '',
-        endDate: '',
-        importType: undefined
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        importType: undefined // 导入类型
       },
       rules: {
         'time': [{ required: true, message: '请选择导入时间', trigger: 'change' }]

+ 7 - 5
src/views/reportData/stockIncomeReport/list.vue

@@ -16,7 +16,7 @@
           <a-row :gutter="15">
             <a-col :md="8" :sm="24">
               <a-form-model-item label="入库完成时间" prop="time">
-                <rangeDate ref="rangeDate" @change="dateChange" />
+                <rangeDate id="stockIncomeReportList-rangeDate" ref="rangeDate" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -91,9 +91,9 @@ export default {
       pieColor: ['#00aaff', '#ffaa00', '#00aa00', '#ff55ff', '#1dc5d4', '#8465c7', '#00ffff'],
       tableData: [], //  含总计数据
       loadData: [], //  不含总计数据
-      listLoading: false,
-      chart1: null,
-      totalData: null
+      listLoading: false, // 加载动画
+      chart1: null, // 图表
+      totalData: null // 统计数据
     }
   },
 
@@ -189,12 +189,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
         }
       })
@@ -239,6 +239,7 @@ export default {
         this.spinning = false
       })
     },
+    // 初始化图表
     chartInit () {
       this.pieData = []
       if (this.loadData.length < 1) {
@@ -271,6 +272,7 @@ export default {
       this.totalData = null
       this.chartInit()
     },
+    // 重置图表
     chartResize () {
       this.chart1.resize()
     }

+ 2 - 0
src/views/reportData/storeReceivedSendStorageReport/list.vue

@@ -18,6 +18,7 @@
               <a-form-model-item label="日期" prop="billDate">
                 <a-month-picker
                   v-model="queryParam.billDate"
+                  id="storeReceivedSendStorageReportList-billDate"
                   :defaultValue="moment().subtract(1, 'month')"
                   :disabled-date="disabledDate"
                   :allowClear="false"
@@ -242,6 +243,7 @@ export default {
     }
   },
   methods: {
+    // 禁用时间范围
     disabledDate (current) {
       return current && current > moment().subtract(1, 'month')
     },

+ 18 - 18
src/views/reportData/storeTransferOutReport/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="storeTransOutReport-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="storeTransOutReport-outWareTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -36,7 +36,7 @@
           <a-col :md="6" :sm="24">
             <a-form-item label="调拨类型">
               <a-select id="sstoreTransOutReport-callOutType" v-model="queryParam.callOutType" placeholder="请选择调拨类型" allowClear >
-                <a-select-option v-for="item in storeCallOutTypeList" :key="item.storeCallOutTypeSn" :value="item.storeCallOutTypeSn">{{ item.name }}</a-select-option>
+                <a-select-option v-for="item in storeCallOutTypeList" :id="item.storeCallOutTypeSn" :key="item.storeCallOutTypeSn" :value="item.storeCallOutTypeSn">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -74,7 +74,7 @@
               v-if="$hasPermissions('M_storeTransferOutReportExport')"
               class="button-warning"
               id="storeTransOutDetailReport-export-btn">导出</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
+            <a @click="advanced=!advanced" style="margin-left: 5px" id="storeTransOutDetailReport-advanced">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -113,8 +113,8 @@ import { downloadExcel } from '@/libs/JGPrint.js'
 import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
 import supplier from '@/views/common/supplier'
-import { storeCallOutTypeAllList } from '@/api/storeCallOutType'
 import custList from '@/views/common/custList.vue'
+import { storeCallOutTypeAllList } from '@/api/storeCallOutType'
 import { reportStoreCallOutDetailList, reportStoreCallOutDetailTotal, reportStoreCallOutDetailExport } from '@/api/reportData'
 export default {
   components: { STable, VSelect, rangeDate, ProductType, ProductBrand, supplier, custList },
@@ -125,12 +125,12 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
-      outWareTime: [],
+      tableHeight: 0, // 表格高度
+      outWareTime: [], // 出库时间
       queryParam: { //  查询条件
-        time: [],
-        beginDate: '',
-        endDate: '',
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
         productEntity: {
           productBrandSn: undefined, //  产品品牌
           productTypeSn1: '', //  产品一级分类
@@ -139,11 +139,11 @@ export default {
           code: '', //  产品编码
           name: '' //  产品名称
         },
-        callOutType: undefined,
-        productType: undefined,
-        storeCallOutNo: '',
-        customerNameCurrent: undefined, //  调往对象
-        customerSnCurrent: undefined
+        callOutType: undefined, // 调拨类型
+        productType: undefined, // 产品分类
+        storeCallOutNo: '', // 店内调出单号
+        customerNameCurrent: undefined, // 调往对象
+        customerSnCurrent: undefined // 调往对象sn
       },
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
@@ -198,8 +198,8 @@ export default {
     }
   },
   methods: {
+    // 选择调往对象
     custChange (v, row) {
-      console.log(v, row)
       if (row && row.customerSn) {
         this.queryParam.customerSnCurrent = row.customerSn
         this.queryParam.customerNameCurrent = undefined
@@ -224,6 +224,7 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
+    // 出库时间  change
     outWareDateChange (date) {
       this.queryParam.outWarehouseBeginDate = date[0]
       this.queryParam.outWarehouseEndDate = date[1]
@@ -234,7 +235,6 @@ export default {
         if (valid) {
           this.$refs.table.refresh(true)
         } else {
-          console.log('error submit!!')
           return false
         }
       })
@@ -281,7 +281,6 @@ export default {
             _this.spinning = false
           })
         } else {
-          console.log('error submit!!')
           return false
         }
       })
@@ -302,6 +301,7 @@ export default {
         }
       })
     },
+    // 页面初始化
     pageInit () {
       this.disabled = false
       this.spinning = false

+ 2 - 2
src/views/reportData/storeTransferOutReport/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">

+ 12 - 11
src/views/reportData/storeTransferOutReport/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="storeTransOutReport-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="storeTransOutReport-outWareTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -36,7 +36,7 @@
           <a-col :md="6" :sm="24">
             <a-form-item label="调拨类型">
               <a-select id="sstoreTransOutReport-callOutType" v-model="queryParam.callOutType" placeholder="请选择调拨类型" allowClear >
-                <a-select-option v-for="item in storeCallOutTypeList" :key="item.storeCallOutTypeSn" :value="item.storeCallOutTypeSn">{{ item.name }}</a-select-option>
+                <a-select-option v-for="item in storeCallOutTypeList" :id="item.storeCallOutTypeSn" :key="item.storeCallOutTypeSn" :value="item.storeCallOutTypeSn">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -98,15 +98,15 @@ export default {
       wrapperCol: { span: 16 },
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
-      outWareTime: [],
+      outWareTime: [], // 出库时间
       queryParam: { //  查询条件
         time: [],
-        beginDate: '',
-        endDate: '',
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
         customerNameCurrent: undefined, //  调往对象
-        customerSnCurrent: undefined,
-        callOutType: undefined,
-        storeCallOutNo: ''
+        customerSnCurrent: undefined, // 调往对象sn
+        callOutType: undefined, // 调拨类型
+        storeCallOutNo: ''// 调拨单号
       },
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
@@ -159,8 +159,8 @@ export default {
     }
   },
   methods: {
+    // 选择调往对象
     custChange (v, row) {
-      console.log(v, row)
       if (row && row.customerSn) {
         this.queryParam.customerSnCurrent = row.customerSn
         this.queryParam.customerNameCurrent = undefined
@@ -185,6 +185,7 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
+    // 出库时间
     outWareDateChange (date) {
       this.queryParam.outWarehouseBeginDate = date[0]
       this.queryParam.outWarehouseEndDate = date[1]
@@ -195,7 +196,6 @@ export default {
         if (valid) {
           this.$refs.table.refresh(true)
         } else {
-          console.log('error submit!!')
           return false
         }
       })
@@ -250,6 +250,7 @@ export default {
         }
       })
     },
+    // 初始化
     pageInit () {
       this.getStoreCallOutTypeAllList()
     }

+ 12 - 12
src/views/reportData/urgentItemsOffsetReport/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="urgentItemsOffsetReport-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -78,7 +78,7 @@
               class="button-warning"
               v-if="$hasPermissions('M_urgentItemsOffsetReportExport')"
               id="urgentItemsOffsetReport-export-btn">导出</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
+            <a @click="advanced=!advanced" style="margin-left: 5px" id="urgentItemsOffsetReport-advanced-btn">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -129,15 +129,15 @@ export default {
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
-        time: [],
-        beginDate: '',
-        endDate: '',
-        buyerNameCurrent: undefined,
-        buyerSnCurrent: undefined,
-        bizBillNo: '',
-        urgentBillNo: '',
-        sourceType: undefined,
-        productType: undefined,
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        buyerNameCurrent: undefined, // 客户名称
+        buyerSnCurrent: undefined, // 客户名称sn
+        bizBillNo: '', // 销售单号
+        urgentBillNo: '', // 冲减单号
+        sourceType: undefined, // 单据来源
+        productType: undefined, // 产品分类
         productBrandSn: undefined, //  产品品牌
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
@@ -225,6 +225,7 @@ export default {
         }
       })
     },
+    // 客户名称
     custSatelliteChange (v, row) {
       if (row && row.customerSn) {
         this.queryParam.buyerSnCurrent = row.customerSn
@@ -275,7 +276,6 @@ export default {
             _this.spinning = false
           })
         } else {
-          console.log('error submit!!')
           return false
         }
       })

+ 3 - 3
src/views/reportData/urgentItemsOffsetReport/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: 'urgentItemsOffsetReportIndex',
+  name: 'UrgentItemsOffsetReportIndex',
   components: {
     report,
     detailReport

+ 9 - 8
src/views/reportData/urgentItemsOffsetReport/list.vue

@@ -15,7 +15,7 @@
         <a-row :gutter="15">
           <a-col :md="5" :sm="24">
             <a-form-model-item label="冲减时间" prop="time">
-              <rangeDate ref="rangeDate" @change="dateChange" />
+              <rangeDate id="urgentItemsOffsetReport-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="5" :sm="24">
@@ -100,16 +100,16 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
+      tableHeight: 0, // 表格高度
       queryParam: { //  查询条件
-        time: [],
-        beginDate: '',
-        endDate: '',
+        time: [], // 时间
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
         buyerNameCurrent: undefined, // 客户名称
         buyerSnCurrent: undefined, // 客户sn
-        bizBillNo: '',
-        urgentBillNo: '',
-        sourceType: undefined
+        bizBillNo: '', // 业务单号
+        urgentBillNo: '', // 冲减单号
+        sourceType: undefined// 单据来源
       },
       rules: {
         'time': [{ required: true, message: '请选择冲减时间', trigger: 'change' }]
@@ -191,6 +191,7 @@ export default {
         }
       })
     },
+    // 客户名称
     custSatelliteChange (v, row) {
       if (row && row.customerSn) {
         this.queryParam.buyerSnCurrent = row.customerSn