浏览代码

修改bug

chenrui 1 年之前
父节点
当前提交
65df83ab3d

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

@@ -87,10 +87,10 @@
                   </a-select>
                   </a-select>
                 </a-form-model-item>
                 </a-form-model-item>
               </a-col>
               </a-col>
-              <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
-                <a-form-item label="客服">
+              <a-col :md="7" :sm="24" v-show="isShowCustomerSearch">
+                <a-form-model-item label="客服">
                   <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
                   <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
-                </a-form-item>
+                </a-form-model-item>
               </a-col>
               </a-col>
             </template>
             </template>
             <a-col :md="isShowCustomerSearch?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: isShowCustomerSearch?'center':''}">
             <a-col :md="isShowCustomerSearch?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: isShowCustomerSearch?'center':''}">
@@ -372,7 +372,7 @@ export default {
       this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.dealer.provinceSn = undefined
       this.queryParam.dealer.provinceSn = undefined
       this.queryParam.product.brandType = ''
       this.queryParam.product.brandType = ''
-      this.queryParam.product.productBrandSn = ''
+      this.queryParam.product.productBrandSn = undefined
       this.queryParam.product.productTypeSn1 = ''
       this.queryParam.product.productTypeSn1 = ''
       this.queryParam.product.productTypeSn2 = ''
       this.queryParam.product.productTypeSn2 = ''
       this.queryParam.product.productTypeSn3 = ''
       this.queryParam.product.productTypeSn3 = ''

+ 1 - 4
src/views/reportData/priceDifferenceDetailReport/list.vue

@@ -121,7 +121,6 @@ export default {
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
       exportLoading: false,
       exportLoading: false,
       showExport: false,
       showExport: false,
       queryParam: { //  查询条件
       queryParam: { //  查询条件
@@ -226,9 +225,7 @@ export default {
       this.queryParam.bizUserSn = undefined
       this.queryParam.bizUserSn = undefined
       this.$refs.rebateDealerList.resetForm()
       this.$refs.rebateDealerList.resetForm()
       this.totalData = null
       this.totalData = null
-      if (this.advanced) {
-        this.$refs.custList.resetForm()
-      }
+      this.$refs.custList.resetForm()
       this.$refs.ruleForm.resetFields()
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()
       this.$refs.table.clearTable()
     },
     },

+ 0 - 2
src/views/reportData/productRebateReport/detailList.vue

@@ -279,8 +279,6 @@ export default {
       this.queryParam.parentDealerSn = undefined
       this.queryParam.parentDealerSn = undefined
       this.queryParam.rebateParentType = undefined
       this.queryParam.rebateParentType = undefined
       this.$refs.dealer.resetForm()
       this.$refs.dealer.resetForm()
-      this.$refs.indirectDealer.resetForm()
-      this.$refs.directDealer.resetForm()
 
 
       this.queryParam.productEntity.productBrandSn = undefined
       this.queryParam.productEntity.productBrandSn = undefined
       this.queryParam.productEntity.productTypeSn1 = ''
       this.queryParam.productEntity.productTypeSn1 = ''

+ 19 - 21
src/views/reportData/productRebateReport/list.vue

@@ -243,32 +243,30 @@ export default {
       this.queryParam.bizType = undefined
       this.queryParam.bizType = undefined
       this.queryParam.buyerSn = undefined
       this.queryParam.buyerSn = undefined
       this.$refs.dealer.resetForm()
       this.$refs.dealer.resetForm()
-      this.$refs.indirectDealer.resetForm()
-      this.$refs.directDealer.resetForm()
       this.$refs.ruleForm.resetFields()
       this.$refs.ruleForm.resetFields()
       this.totalData = null
       this.totalData = null
       this.$refs.table.clearTable()
       this.$refs.table.clearTable()
     },
     },
     // 导出
     // 导出
-    handleExport () {
-      const _this = this
-      this.$refs.ruleForm.validate(valid => {
-        if (valid) {
-          const params = _this.queryParam
-          params.showCost = this.$hasPermissions('M_ShowAllCost') ? '1' : '0'
-          _this.exportLoading = true
-          _this.spinning = true
-          reportSalesReturnExport(params).then(res => {
-            downloadExcel(res, '销售退货报表')
-            _this.exportLoading = false
-            _this.spinning = false
-          })
-        } else {
-          console.log('error submit!!')
-          return false
-        }
-      })
-    },
+    // handleExport () {
+    //   const _this = this
+    //   this.$refs.ruleForm.validate(valid => {
+    //     if (valid) {
+    //       const params = _this.queryParam
+    //       params.showCost = this.$hasPermissions('M_ShowAllCost') ? '1' : '0'
+    //       _this.exportLoading = true
+    //       _this.spinning = true
+    //       reportSalesReturnExport(params).then(res => {
+    //         downloadExcel(res, '销售退货报表')
+    //         _this.exportLoading = false
+    //         _this.spinning = false
+    //       })
+    //     } else {
+    //       console.log('error submit!!')
+    //       return false
+    //     }
+    //   })
+    // },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 250
       this.tableHeight = window.innerHeight - tableSearchH - 250