LaveyD hai 8 meses
pai
achega
dabb5c9ffa

+ 3 - 0
src/components/Layout/components/Navbar.vue

@@ -43,6 +43,9 @@
           更新日志
         </a>
       </li>
+      <li>
+        <strong>{{ $store.state.user.name }}</strong>
+      </li>
       <el-dropdown
         class="avatar-container right-menu-item"
         trigger="click"

+ 3 - 0
src/components/Layout/components/TagsView.vue

@@ -43,6 +43,7 @@
 
 <script>
 import ScrollPane from '@/components/ScrollPane'
+import { EventBus } from '@/utils/eventBus'
 
 export default {
   components: { ScrollPane },
@@ -132,6 +133,8 @@ export default {
       // console.log(offset)
       this.left = e.clientX - offset
       this.top = e.clientY
+
+      EventBus.$emit('activeTag', tag)
     },
     closeMenu () {
       this.visible = false

+ 10 - 0
src/pages/queryReport/salesQuery.vue

@@ -1462,6 +1462,7 @@ import moment from 'moment'
 import { payPOS } from '@/api/pay'
 import { getSelf } from '@/api/systemSetting/account'
 import { getSystemConfigList } from '@/api/systemConfig'
+import { EventBus } from '@/utils/eventBus'
 
 export default {
   name: 'salesQuery',
@@ -1624,6 +1625,12 @@ export default {
   mounted () {
     this.getSaleChannelList()
     this.getOrderList()
+
+    EventBus.$on('activeTag', (tag) => {
+      if (tag === '/queryReport/salesQuery') {
+        this.getOrderList()
+      }
+    })
   },
   methods: {
     getPayStatus,
@@ -2009,6 +2016,9 @@ export default {
         this.getOrderList()
       })
     }
+  },
+  beforeDestroy () {
+    EventBus.$off('activeTag')
   }
 }
 </script>

+ 7 - 4
src/pages/sellManage/retail/FormInfo.vue

@@ -108,7 +108,10 @@
           key="id2"
           label="证件号码"
           prop="buyerIdentify">
-          <el-input v-model="form.buyerIdentify"></el-input>
+          <!-- <el-input v-model="form.buyerIdentify"></el-input> -->
+          <ReaderInput
+            type="ID"
+            v-model="form.buyerIdentify"></ReaderInput>
         </el-form-item>
         <el-form-item
           v-if="Certificate.Nation"
@@ -240,7 +243,7 @@ import { verifyId, verifyPhone } from '@/utils/validate'
 import { checkWayList } from '@/assets/staticData'
 import { setTourist } from '@/pages/common'
 import TouristList from '../common/TouristList'
-// import ReaderInput from '@/components/ReaderInput'
+import ReaderInput from '@/components/ReaderInput'
 import moment from 'moment'
 import { IDENTIFY_TYPES } from '@/const'
 import { getTeamList, getGuideList } from '@/api/checker'
@@ -262,8 +265,8 @@ export default {
     }
   },
   components: {
-    TouristList
-    // ReaderInput
+    TouristList,
+    ReaderInput
   },
   computed: {
     category () {

+ 3 - 0
src/pages/sellManage/retail/RecentOrder.vue

@@ -72,6 +72,7 @@ import { apiOrderList } from '@/api/order'
 import mixin from './mixin'
 import orderItemMixin from '../common/orderItemMixin'
 import moment from 'moment'
+import { EventBus } from '@/utils/eventBus'
 
 export default {
   mixins: [mixin, orderItemMixin],
@@ -125,6 +126,8 @@ export default {
     },
     getMoreOrders () {
       this.$router.push({ name: 'salesQuery' })
+
+      EventBus.$emit('activeTag', '/queryReport/salesQuery')
     }
   }
 }

+ 1 - 1
src/pages/systemSetting/account.vue

@@ -168,7 +168,7 @@
         :current-page.sync="form.pageNum"
         :page-sizes="[10, 20, 50, 100]"
         @size-change="handleSizeChange"
-        @current-change="handlePage()"
+        @current-change="handlePage"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >