bug fix

src/config/api.js

@@ -459,6 +459,13 @@ const apis = {
       method: 'delete',
       url: `${commPrefix}/taCustomerTransfer/delete/:id`
     },
+  },
+
+  sysDict: {
+    list: {
+      method: 'get',
+      url: `${commPrefix}/sysDict`
+    },
   }
 
 }

src/router.js

@@ -78,6 +78,8 @@ router.beforeEach((to, from, next) => {
 
   // 尝试去获取人员
   store.dispatch('getUser').then(() => {
+    // 获取通用字典
+    store.dispatch('getSysDict')
 
     // 校验权限
     if (checkAuthority(store.state, to.name)) {

src/store/modules/dailyRegistration.js

@@ -1,4 +1,5 @@
 import lodash from 'lodash'
+import dayjs from 'dayjs'
 import { interact } from '../../utils'
 import apis from '../../config/api'
 

src/store/modules/sysuser.js

@@ -27,6 +27,18 @@ export default {
         label: '吧台人员',
         value: 'bar-usher',
       },
+      {
+        label: '置业经理',
+        value: 'consultant_manager',
+      },
+      {
+        label: '渠道经理',
+        value: 'channel_manager',
+      },
+      {
+        label: '营 销 总',
+        value: 'general_manager',
+      },
       {
         label: '其他',
         value: '',

src/store/system.js

@@ -12,6 +12,7 @@ export default {
     menus: [],
     user: {},
     userLoged: false,
+    sysDict: undefined,
   },
   mutations: {
     updateUser(state, user) {
@@ -92,6 +93,24 @@ export default {
       interact(api, payload).then(() => {
 
       })
-    }
+    },
+    getSysDict ({commit, state}, payload) {
+      if (state.sysDict) {
+        return
+      }
+
+      const api = apis.sysDict.list
+      interact(api).then((dt) => {
+        const sysDict = (dt || []).reduce((acc, item) => {
+          return {
+            ...acc,
+            [`${item.type}`]: (acc[item.type] || []).concat(item)
+          }
+        }, {})
+
+        commit('syncState', {sysDict})
+      })
+    },
+
   }
 }

src/utils/index.js

@@ -98,6 +98,11 @@ export const interact = request({
   }
 })
 
+export function mixinPhone(phone) {
+  if (!phone) return ''
+  return phone.replace(/(.{3})(.*)(.{4})/g, '$1****$3')
+}
+
 // 未定义的就使用默认值
 const ifUndifined = (val, def) => (val === undefined ? def : val)
 const withDefault = (val, def) => ({ ...def, ...ifUndifined(val, def) })

src/views/dailyRegistration/index.vue

@@ -25,10 +25,7 @@
        </el-form-item> 
       <el-form-item label="客户来源">
         <el-select v-model="formInline.customerSource " clearable placeholder="请选择">
-          <el-option label="自然" value="109" />
-          <el-option label="自拓" value="110"/>
-          <el-option label="自渠" value="111"/>
-          <el-option label="老客" value="112"/>
+          <el-option :label="item.label" :value="item.id" v-for="item in sysDict['customerSourceDict']" :key="item.id" />
         </el-select>
        </el-form-item> 
       <el-form-item label="姓名">
@@ -40,15 +37,14 @@
       <el-form-item label="接待人">
         <el-input v-model="formInline.receiver" placeholder="输入接待人"></el-input>
       </el-form-item>
-      </el-form-item>   
+      <el-form-item>   
         <el-button type="primary" @click="onSubmit">查询</el-button> 
         <el-button type="info" @click="clear">重置</el-button>
       </el-form-item>
+      <el-form-item style="float: right; margin-right: 50px;">  
+        <a style="text-decoration: none" :href="exportExcelUrl">导出</a>
+      </el-form-item>
     </el-form>
-    <div style="height:70px;line-height:70px">
-      <a href="excel/usherListExcel">导出</a>
-        <el-button type="primary" @click="outPut" style="float:right"></el-button> 
-    </div>
     <el-table
     :data="dailyList.records"
     border>
@@ -57,7 +53,7 @@
       label="客户类型"
       align='center'>
           <template slot-scope="scope">
-             <!-- <span>{{ scope.row.customerType =='channel'? '渠道客户':'自销客户' }}</span> -->
+            <span>{{ scope.row.customerType =='channel'? '渠道客户':'自销客户' }}</span>
           </template>
     </el-table-column>
     <el-table-column
@@ -69,11 +65,17 @@
       prop="phone"
       label="手机号"
       align='center'>
+        <template slot-scope="scope">
+            <span>{{ mixinPhone(scope.row.phone) }}</span>
+        </template>
     </el-table-column>
     <el-table-column
       prop="personNum"
       label="来访人数"
       align='center'>
+          <template slot-scope="scope">
+             <span>{{ filterPersonNum(scope.row.personNum) }}</span>
+          </template>
     </el-table-column>
     <el-table-column
     align='center'
@@ -89,7 +91,7 @@
       label="客户来源"
       align='center'>
           <template slot-scope="scope">
-             <span>{{ scope.row.customerSource |filterCustomerSource }}</span>
+             <span>{{ filterCustomerSource(scope.row.customerSource) }}</span>
           </template>
     </el-table-column>
     <el-table-column
@@ -109,20 +111,23 @@
     </el-table-column>
   </el-table>
     <el-pagination
-            style="margin-top:50px;float:right"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="formInline.pageNum"
-            :page-sizes="[1,10, 20, 30, 40]"
-            :page-size="formInline.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="dailyList.total || 0">
+      style="margin-top:50px;float:right"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="formInline.pageNum"
+      :page-sizes="[1,10, 20, 30, 40]"
+      :page-size="formInline.pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="dailyList.total || 0">
     </el-pagination>
   </div>
 </template>
 
 <script>
+import dayjs from 'dayjs'
 import { createNamespacedHelpers } from 'vuex'
+import { mixinPhone } from '../../utils'
+
 const {mapState: mapDailyRegistrationState, mapActions: mapDailyRegistrationActions } = createNamespacedHelpers('dailyRegistration')
 
 export default {
@@ -130,8 +135,8 @@ export default {
   data() {
     return {
       formInline: {
-        startTime :'',
-        endTime :'',
+        startTime : dayjs().hour(0).minute(0).second(0).toDate(),
+        endTime : new Date(),
         personName: '',
         phone: '',
         customerType: '',
@@ -146,29 +151,29 @@ export default {
     ...mapDailyRegistrationState({
     dailyList: x => x.dailyList,
     excelList: x => x.excelList
-    })
+    }),
+    sysDict () {
+      return this.$store.state.sysDict
+    },
+    queryFitlers () {
+      return {
+        ...this.formInline,
+        startTime: dayjs(this.formInline.startTime).format('YYYY-MM-DDT00:00:00Z'),
+        endTime: dayjs(this.formInline.endTime).format('YYYY-MM-DDT23:59:59Z'),
+      }
+    },
+    exportExcelUrl() {
+      const queryString = Object.keys(this.queryFitlers).map((k) => {
+        return `${k}=${encodeURIComponent(this.queryFitlers[k])}`
+      }).join('&')
+
+      return `${window.location.origin}/api/excel/usherListExcel?${queryString}`
+      // return `http://127.0.0.1:8080/excel/usherListExcel?${queryString}`
+    },
   },
   created() {
     this.getPage()
   },
-  filters:{
-    filterCustomerSource(val){
-      if(val=='109'){
-        return  '自然'
-      }
-      else if(val=='110'){
-        return  '自拓'
-      }
-      else if(val=='111'){
-        return  '自渠'
-      }
-      else if(val=='112'){
-        return  '老客'
-      }else{
-        return
-      }
-    }
-  },
   methods: {
     ...mapDailyRegistrationActions([
       'getDailyRegistration',
@@ -179,12 +184,8 @@ export default {
       this.formInline.pageSize = 10
       this.getPage()
     },
-    outPut(){
-      this.getUsherListExcel(this.formInline)
-    },
     getPage() {
-      this.getDailyRegistration(this.formInline)
-   
+      this.getDailyRegistration(this.queryFitlers)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`)
@@ -203,6 +204,15 @@ export default {
         return ''
       }
     },
+    mixinPhone (phone) {
+      return mixinPhone(phone)
+    },
+    filterCustomerSource(val){
+      return (this.sysDict['customerSourceDict'].filter(x => x.id == val)[0] || {}).label
+    },
+    filterPersonNum(val) {
+      return (this.sysDict['NUMBER_OF_VISITORS'].filter(x => x.id == val)[0] || {}).label
+    },
     clear(){
       this.formInline.personName = ''
       this.formInline.phone = ''

vue.config.js

@@ -3,8 +3,8 @@ module.exports = {
   devServer: {
     proxy: {
       '/api': {
-        target: 'http://192.168.0.238:8080',
-        // target: 'http://127.0.0.1:8080',
+        // target: 'http://192.168.0.238:8080',
+        target: 'http://127.0.0.1:8080',
         changeOrigin: true,
         pathRewrite: {
           '^/api': '/'