Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev

.env.production

@@ -6,10 +6,10 @@ ENV = 'production'
 # VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
 
 # 生产
-# VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
+VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
 
 # 预发布接口
-VUE_APP_BASE_API  = 'https://pre-cashieradmin.sxczgkj.cn'
+# VUE_APP_BASE_API  = 'https://pre-cashieradmin.sxczgkj.cn'
 
 # VUE_APP_BASE_API  = 'http://192.168.2.98:8000'
 # 如果接口是 http 形式， wss 需要改为 ws

src/layout/components/TagsView/index.vue

@@ -3,9 +3,10 @@
     <scroll-pane ref="scrollPane" class="tags-view-wrapper">
       <router-link v-for="tag in visitedViews" ref="tag" :key="tag.path" :class="isActive(tag) ? 'active' : ''"
         :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" tag="span" class="tags-view-item"
-        @click.middle.native="closeSelectedTag(tag)" @contextmenu.prevent.native="openMenu(tag, $event)">
+        @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''"
+        @contextmenu.prevent.native="openMenu(tag, $event)">
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
@@ -58,6 +59,9 @@ export default {
     this.addTags()
   },
   methods: {
+    isAffix(tag) {
+      return tag.meta && tag.meta.affix
+    },
     isActive(route) {
       return route.path === this.$route.path
     },

src/views/invoicing/consumable/information.vue

@@ -634,6 +634,7 @@ import { hasPermission } from '@/utils/limits.js'
 
 export default {
   components: { AddConsTakin, UploadExcel, consRecordDetail },
+  name:'information',
   data() {
     return {
       tongji: {},//统计

src/views/invoicing/operation_in.vue

@@ -240,6 +240,7 @@ import { tbConsInfoGet, tbProductlist } from "@/api/invoicing";
 import { tbShopPurveyorGet, tbProductStockOperateOutAndOn, stockInOut } from '@/api/invoicing'
 import { formatDecimal } from '@/utils'
 export default {
+  name:'operation_in',
     components: {
         shopList,
         ConsumableList

src/views/invoicing/operation_out.vue

@@ -236,6 +236,7 @@ import { tbShopPurveyorGet, tbProductStockOperateOutAndOn, stockInOut, tbConsInf
 
 import { formatDecimal } from '@/utils'
 export default {
+  name:'operation_out',
     components: {
         shopList,
         ConsumableList

src/views/product/add_shop.vue

@@ -437,6 +437,7 @@ export default {
     Editor,
     addImg,
   },
+  name:'add_shop',
   data() {
     const validatordateUsed = (rule, value, callback) => {
       if (!this.form.notices.dateUsed) {

src/views/product/index.vue

@@ -244,6 +244,7 @@ import { tbProductListV2, tbShopCategoryGet, tbProductDelete, tbProductIsHot, up
 import { hasPermission } from '@/utils/limits.js'
 
 export default {
+  name:'product',
   components: {
     BindCons,
     StockHistory