Browse Source

修改navbar

csx 6 years ago
parent
commit
a4b0d8b5da

+ 1 - 1
src/views/layout/Layout.vue View File

2
   <div class="app-wrapper" :class="classObj">
2
   <div class="app-wrapper" :class="classObj">
3
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"></div>
3
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"></div>
4
       <navbar></navbar>
4
       <navbar></navbar>
5
-    
5
+
6
     <div class="Header-container">
6
     <div class="Header-container">
7
     <sidebar class="sidebar-container"></sidebar>
7
     <sidebar class="sidebar-container"></sidebar>
8
     <div class="main-container">
8
     <div class="main-container">

+ 2 - 5
src/views/layout/components/Navbar.vue View File

5
     </div>
5
     </div>
6
     <el-menu class="navbar" mode="horizontal">
6
     <el-menu class="navbar" mode="horizontal">
7
       <div>
7
       <div>
8
-        <el-dropdown trigger="click" style="color:#fff;">
9
-        <span class="el-dropdown-link">{{ this.$store.getters.xt_user.org.org_name }}
10
-          <!--<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
8
+        <span> {{this.$store.getters.xt_user.org.org_name}}
11
         </span>
9
         </span>
12
-        </el-dropdown>
13
       </div>
10
       </div>
14
       <div class="system-nav">
11
       <div class="system-nav">
15
         <div class="system-nav-menu">
12
         <div class="system-nav-menu">
116
         return false
113
         return false
117
       }
114
       }
118
     },
115
     },
119
-    create() {
116
+    created() {
120
       var xtuser = this.$store.getters.xt_user
117
       var xtuser = this.$store.getters.xt_user
121
       this.orgname = xtuser.org.org_name
118
       this.orgname = xtuser.org.org_name
122
       console.log(this.orgname)
119
       console.log(this.orgname)

+ 4 - 0
src/xt_pages/stock/Dialog/stockInDialog.vue View File

124
         this.goodInfoTableData = []
124
         this.goodInfoTableData = []
125
         this.$emit('dialog-cancle', this.getValue())
125
         this.$emit('dialog-cancle', this.getValue())
126
         this.$refs.multipleTable.clearSelection()
126
         this.$refs.multipleTable.clearSelection()
127
+        this.$refs.templatetable.setCurrentRow(null);
128
+
127
       },
129
       },
128
       comfirm: function(formName) {
130
       comfirm: function(formName) {
129
         this.goodInfo = []
131
         this.goodInfo = []
130
         this.goodInfoTableData = []
132
         this.goodInfoTableData = []
131
         this.$emit('dialog-comfirm', this.getValue())
133
         this.$emit('dialog-comfirm', this.getValue())
132
         this.$refs.multipleTable.clearSelection()
134
         this.$refs.multipleTable.clearSelection()
135
+        this.$refs.templatetable.setCurrentRow(null);
136
+
133
       },
137
       },
134
       getValue: function() {
138
       getValue: function() {
135
         const obj = {
139
         const obj = {