فهرست منبع

经销商账户

chenrui 3 ماه پیش
والد
کامیت
16d03f77f8

+ 1 - 0
src/config/dealerManagement.js

@@ -137,6 +137,7 @@ export default {
           meta: {
           meta: {
             title: '轮胎补贴金额',
             title: '轮胎补贴金额',
             icon: 'thunderbolt',
             icon: 'thunderbolt',
+            replaceTab: true,
             hidden: true
             hidden: true
             // permission: 'M_dealerAccountDetail'
             // permission: 'M_dealerAccountDetail'
           }
           }

+ 8 - 0
src/views/dealerManagement/dealerAccount/checkAccountModal.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

+ 8 - 0
src/views/dealerManagement/dealerAccount/checkRecordModal.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

+ 32 - 50
src/views/dealerManagement/dealerAccount/detail.vue

@@ -1,19 +1,19 @@
 <template>
 <template>
   <div class="categorySet-wrap">
   <div class="categorySet-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
     <a-spin :spinning="spinning" tip="Loading...">
-      <div ref="headerBar">
+      <div>
         <a-page-header :ghost="false" :backIcon="false" class="header-bar">
         <a-page-header :ghost="false" :backIcon="false" class="header-bar">
           <!-- 自定义的二级文字标题 -->
           <!-- 自定义的二级文字标题 -->
           <template slot="subTitle">
           <template slot="subTitle">
             <a id="salesEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
             <a id="salesEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-            <span class="subTitle-word text-overflow" style="max-width:300px;margin-left:15px;">轮胎补贴金额(箭冠汽配东莞店):<h3>11212121</h3></span>
-            <a-button type="danger" ghost id="settingsIndex-addArea">调账</a-button>
-            <a-button type="primary" ghost id="settingsIndex-addArea">调整记录</a-button>
+            <span class="subTitle-word text-overflow" style="margin:0 15px;">轮胎补贴金额(箭冠汽配东莞店):<span style="font-size:20px;">11212121</span></span>
+            <a-button type="danger" style="margin-right:15px;" ghost id="settingsIndex-addArea">调账</a-button>
+            <a-button type="primary" class="button-info" ghost id="settingsIndex-addArea">调整记录</a-button>
           </template>
           </template>
         </a-page-header>
         </a-page-header>
       </div>
       </div>
       <a-card size="small" :bordered="false">
       <a-card size="small" :bordered="false">
-        <div class="table-page-search-wrapper newTableSearchName" >
+        <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName" >
           <a-form layout="inline" id="settingsIndex-form" @keyup.enter.native="$refs.table.refresh(true)">
           <a-form layout="inline" id="settingsIndex-form" @keyup.enter.native="$refs.table.refresh(true)">
             <a-row :gutter="15">
             <a-row :gutter="15">
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
@@ -24,7 +24,7 @@
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="业务类型">
                 <a-form-model-item label="业务类型">
                   <v-select
                   <v-select
-                    v-model="queryParam.dealer.dealerLevel"
+                    v-model="queryParam.dealerLevel"
                     ref="dealerLevel"
                     ref="dealerLevel"
                     id="actualSalesReportList-dealerLevel"
                     id="actualSalesReportList-dealerLevel"
                     code="DEALER_LEVEL"
                     code="DEALER_LEVEL"
@@ -35,7 +35,7 @@
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="入账类型">
                 <a-form-model-item label="入账类型">
                   <v-select
                   <v-select
-                    v-model="queryParam.dealer.dealerLevel"
+                    v-model="queryParam.dealerLevel"
                     ref="dealerLevel"
                     ref="dealerLevel"
                     id="actualSalesReportList-dealerLevel"
                     id="actualSalesReportList-dealerLevel"
                     code="DEALER_LEVEL"
                     code="DEALER_LEVEL"
@@ -98,7 +98,8 @@ export default {
         hasDetail: 0,
         hasDetail: 0,
         bizType: undefined, // 区域分区区别
         bizType: undefined, // 区域分区区别
         bizSn: undefined, // 当前行sn
         bizSn: undefined, // 当前行sn
-        dealerName: ''// 经销商
+        dealerName: '', // 经销商
+        dealerLevel: undefined
       },
       },
       columns: [
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
@@ -141,31 +142,6 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
       this.queryParam.endDate = date[1] || ''
     },
     },
-    // 获取用户基本信息
-    getBaseInfo () {
-      const _this = this
-      findById({ id: _this.$route.query.id }).then(res => {
-        if (res.status == 200) {
-          _this.infoObj = res.data
-          if (res.data.allDealerFlag != 1) {
-            _this.activeKeyVal = '1'
-            _this.$nextTick(() => {
-              _this.$refs.table.refresh()
-            })
-          } else if (res.data.allDealerFlag == 1 && res.data.allProductFlag != 1) {
-            _this.activeKeyVal = '2'
-            _this.$nextTick(() => {
-              this.$refs.setCategory.pageInit()
-            })
-          } else if (res.data.allDealerFlag == 1 && res.data.allProductFlag == 1 && res.data.allSupplierFlag != 1) {
-            _this.activeKeyVal = '3'
-            _this.$nextTick(() => {
-              this.$refs.setSupplier.pageInit()
-            })
-          }
-        }
-      })
-    },
     // 选择区域>分区
     // 选择区域>分区
     handleArea (con) {
     handleArea (con) {
       const chooseData = con.checked
       const chooseData = con.checked
@@ -229,10 +205,8 @@ export default {
         dealerName: '',
         dealerName: '',
         hasDetail: 0
         hasDetail: 0
       }
       }
-      if (this.infoObj && this.infoObj.allDealerFlag != 1) {
-        this.$refs.subarea.clearData()
-        this.$refs.table.refresh(true)
-      }
+      this.$refs.subarea.clearData()
+      this.$refs.table.refresh(true)
     },
     },
     // 选择区域
     // 选择区域
     async openAreaModal () {
     async openAreaModal () {
@@ -314,7 +288,7 @@ export default {
     },
     },
     //  返回
     //  返回
     handleBack () {
     handleBack () {
-      this.$router.push({ name: 'businessOwnerSettings' })
+      this.$router.push({ name: 'dealerAccountList' })
     },
     },
     // 初始化
     // 初始化
     pageInit () {
     pageInit () {
@@ -322,12 +296,13 @@ export default {
       this.$nextTick(() => { // 页面渲染完成后的回调
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
         _this.setTableH()
       })
       })
-      _this.getBaseInfo()
+      _this.$refs.table.refresh(true)
     },
     },
     // 计算列表高度
     // 计算列表高度
     setTableH () {
     setTableH () {
-      const headHeight = this.$refs.headerBar.offsetHeight
-      this.tableHeight = window.innerHeight - headHeight - 340
+      console.log('1111:', this.$refs)
+      const searchHeight = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - searchHeight - 340
     }
     }
   },
   },
   watch: {
   watch: {
@@ -335,19 +310,26 @@ export default {
       this.setTableH()
       this.setTableH()
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
-    this.pageInit()
+    // 如果是新页签打开,则重置当前页面
+    if (this.$store.state.app.isNewTab) {
+      this.pageInit()
+      this.resetSearchForm()
+    }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.$refs.table.refresh()
+      this.pageInit()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {})
     next(vm => {})
   }
   }
 }
 }
 </script>
 </script>
-
-<style lang="less" scoped>
-  .categorySet-wrap{
-    .table-operator{
-    text-align:right;
-    }
-  }
-</style>

+ 1 - 1
src/views/dealerManagement/dealerAccount/list.vue

@@ -132,7 +132,7 @@ export default {
   },
   },
   methods: {
   methods: {
     handleDetail (row) {
     handleDetail (row) {
-      this.$router.push({ name: 'dealerAccountDetail', params: { sn: row.salesBillSn } })
+      this.$router.push({ name: 'dealerAccountDetail', params: { sn: row.tenantSn } })
     },
     },
     // 客户名称 change
     // 客户名称 change
     custChange (val) {
     custChange (val) {

+ 1 - 7
src/views/setting/tireSubsidySetting/addSubsidyList.vue

@@ -352,16 +352,10 @@ export default {
           ajaxName({ ruleSn: row.ruleSn, ruleType: _this.pageType }).then(res => {
           ajaxName({ ruleSn: row.ruleSn, ruleType: _this.pageType }).then(res => {
             if (res.status == 200) {
             if (res.status == 200) {
               if (res.data && res.data === 'FALSE') {
               if (res.data && res.data === 'FALSE') {
-                _this.$confirm({
+                _this.$info({
                   title: '提示',
                   title: '提示',
                   content: '当前规则不可操作,请刷新后重试',
                   content: '当前规则不可操作,请刷新后重试',
                   centered: true,
                   centered: true,
-                  okText: '知道了',
-                  cancelButtonProps: {
-                    style: {
-                      display: 'none' // 通过设置样式隐藏取消按钮
-                    }
-                  },
                   onOk () {
                   onOk () {
                     console.log('知道了')
                     console.log('知道了')
                   }
                   }

+ 1 - 7
src/views/setting/tireSubsidySetting/addSubsidyModal.vue

@@ -256,16 +256,10 @@ export default {
           }
           }
         })
         })
       } else {
       } else {
-        this.$confirm({
+        this.$info({
           title: '提示',
           title: '提示',
           content: '已存在【启用中】的' + (_this.pageType === 'SUBSIDY_QUARTER_FEE' ? '季' : '年') + '度增量补贴',
           content: '已存在【启用中】的' + (_this.pageType === 'SUBSIDY_QUARTER_FEE' ? '季' : '年') + '度增量补贴',
           centered: true,
           centered: true,
-          okText: '知道了',
-          cancelButtonProps: {
-            style: {
-              display: 'none' // 通过设置样式隐藏取消按钮
-            }
-          },
           onOk () {
           onOk () {
             console.log('知道了')
             console.log('知道了')
           }
           }

+ 1 - 7
src/views/setting/tireSubsidySetting/costAddModal.vue

@@ -183,16 +183,10 @@ export default {
           }
           }
         })
         })
       } else {
       } else {
-        this.$confirm({
+        this.$info({
           title: '提示',
           title: '提示',
           content: '已存在【未开始】的' + (_this.pageType === 'SERVICE_FEE' ? '服务费比例' : '运费补贴'),
           content: '已存在【未开始】的' + (_this.pageType === 'SERVICE_FEE' ? '服务费比例' : '运费补贴'),
           centered: true,
           centered: true,
-          okText: '知道了',
-          cancelButtonProps: {
-            style: {
-              display: 'none' // 通过设置样式隐藏取消按钮
-            }
-          },
           onOk () {
           onOk () {
             console.log('知道了')
             console.log('知道了')
           }
           }

+ 1 - 7
src/views/setting/tireSubsidySetting/editModal.vue

@@ -209,16 +209,10 @@ export default {
     // 错误提示语
     // 错误提示语
     openTip (code) {
     openTip (code) {
       const _this = this
       const _this = this
-      this.$confirm({
+      this.$info({
         title: '提示',
         title: '提示',
         content: '当前规则不可操作,请刷新后重试',
         content: '当前规则不可操作,请刷新后重试',
         centered: true,
         centered: true,
-        okText: '知道了',
-        cancelButtonProps: {
-          style: {
-            display: 'none' // 通过设置样式隐藏取消按钮
-          }
-        },
         onOk () {
         onOk () {
           console.log('知道了')
           console.log('知道了')
         }
         }