فهرست منبع

【ID1005222】已购套餐-去掉单据状态筛选条件
【ID1005211】登录后合作商名称和负责人名称都显示

chenrui 4 سال پیش
والد
کامیت
e7728c1f3b
4فایلهای تغییر یافته به همراه22 افزوده شده و 14 حذف شده
  1. 3 3
      src/components/tools/UserMenu.vue
  2. 1 0
      src/store/getters.js
  3. 6 0
      src/store/modules/user.js
  4. 12 11
      src/views/SetmealSales/PurchasedSetmeal.vue

+ 3 - 3
src/components/tools/UserMenu.vue

@@ -10,8 +10,8 @@
       <a-dropdown>
         <span class="action ant-dropdown-link user-dropdown-menu">
           <!-- <a-avatar class="avatar" size="small" :src="avatar==''?defaultAvatar:avatar"/> -->
-          <a-icon type="user" />
-          <span style="margin: 0 5px;">{{ nickname }}</span>
+          <!-- <a-icon type="user" /> -->
+          <span style="margin: 0 5px;">{{ salesChannelName }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ nickname }}</span>
           <a-icon type="down" />
         </span>
         <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
@@ -54,7 +54,7 @@ export default {
     NoticeIcon
   },
   computed: {
-    ...mapGetters(['nickname', 'avatar'])
+    ...mapGetters(['nickname', 'avatar', 'salesChannelName'])
   },
   data () {
     return {

+ 1 - 0
src/store/getters.js

@@ -5,6 +5,7 @@ const getters = {
   token: state => state.user.token,
   avatar: state => state.user.avatar,
   nickname: state => state.user.name,
+  salesChannelName: state => state.user.salesChannelName,
   welcome: state => state.user.welcome,
   roles: state => state.user.roles,
   userInfo: state => state.user.info,

+ 6 - 0
src/store/modules/user.js

@@ -7,6 +7,7 @@ const user = {
   state: {
     token: '',
     name: '',
+    salesChannelName: '',
     welcome: '',
     avatar: '',
     roles: { permissionList: [] },
@@ -23,6 +24,9 @@ const user = {
       state.welcome = welcome
       Vue.ls.set('userName', name, 7 * 24 * 60 * 60 * 1000)
     },
+    SET_CHANNELNAME: (state, name) => {
+      state.salesChannelName = name
+    },
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar
     },
@@ -48,6 +52,7 @@ const user = {
               Vue.ls.set('hasError', 0)
               commit('SET_TOKEN', res.access_token)
               commit('SET_NAME', { name: users.userNameCN, welcome: welcome() })
+              commit('SET_CHANNELNAME', users.extInfo.channel.salesChannelName)
               Vue.ls.set('rolesAccess', { permissionList: users.permCodes }, 7 * 24 * 60 * 60 * 1000)
               commit('SET_AVATAR', res.avatar ? res.avatar : '')
               // 记住密码
@@ -88,6 +93,7 @@ const user = {
           resolve(error)
         }).finally(() => {
           commit('SET_NAME', { name: '', welcome: '' })
+          commit('SET_CHANNELNAME', '')
           commit('SET_AVATAR', '')
           commit('SET_TOKEN', '')
           commit('SET_ROLES', { permissionList: [] })

+ 12 - 11
src/views/SetmealSales/PurchasedSetmeal.vue

@@ -30,17 +30,18 @@
               <a-input v-model.trim="searchForm.bundleName" id="purchasedSetmeal-bundleName" placeholder="请输入套餐名称" allowClear />
             </a-form-item>
           </a-col>
-          <a-col :span="6">
-            <a-form-item label="单据状态" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <v-select
-                v-model="searchForm.orderFlag"
-                ref="orderFlag"
-                id="purchasedSetmeal-status"
-                code="PAY_STATUS"
-                placeholder="请选择单据状态"
-                allowClear></v-select>
-            </a-form-item>
-          </a-col>
+          <!-- <a-col :span="6">
+            <a-form-item label="单据状态" :label-col="{ span:7 }" :wrapper-col="{ span:17}"> -->
+          <v-select
+            v-show="false"
+            v-model="searchForm.orderFlag"
+            ref="orderFlag"
+            id="purchasedSetmeal-status"
+            code="PAY_STATUS"
+            placeholder="请选择单据状态"
+            allowClear></v-select>
+          <!-- </a-form-item>
+          </a-col> -->
           <a-col :span="6">
             <a-form-item label="结算状态" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
               <v-select