Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin into develop

src/components/template/operation_mixin.js

@@ -29,7 +29,6 @@ export default {
   methods: {
     optionsEvensAuth(key, obj) {
       var roleItems = this.$route.meta.roleItems
-      console.log(roleItems)
       if (!roleItems || !roleItems.length) {
         return { isRole: false }
       }

src/layout/components/Navbar.vue

@@ -18,14 +18,14 @@
       </div>
       <!-- 右侧 -->
       <div class="right-menu">
-        <!-- <div class="right-menu-item">
+        <div class="right-menu-item">
           <el-autocomplete
             v-model="pathurl"
             :fetch-suggestions="querySearchAsync"
             placeholder="搜索菜单"
             @select="handleSelect"
           ></el-autocomplete>
-        </div> -->
+        </div>
         <div style="margin-right: 20px; cursor: pointer" @click="
           getList()
         isShow = true
@@ -333,9 +333,8 @@ export default {
       }
       window.open(link)
     },
-
     querySearchAsync(queryString, cb) {
-      var data = pages.filter(item => ~item.meta.title.indexOf(queryString))
+      var data = pages.filter(item => !!~item.path.indexOf(":pageName?/:pageType?/:pageCode?/:pagePam?") && !!~item.meta.title.indexOf(queryString))
       cb(
         data.map(item => ({
           value: item.meta.title,

src/views/setting/organizationManagement/settledManagement/index.vue

@@ -111,10 +111,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="商品出入库" prop="joinCode">
+              <el-form-item label="库存管理方式" prop="joinCode">
                 <el-radio-group v-model="step1Form.joinCode">
-                  <el-radio :label="true">关联条码</el-radio>
-                  <el-radio :label="false">不关联条码</el-radio>
+                  <el-radio label="NO">不管理</el-radio>
+                  <el-radio label="CODE">管条码</el-radio>
+                  <el-radio label="NUM">管数量</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>

src/views/setting/organizationManagement/tenantDetails/index.vue

@@ -96,10 +96,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="商品出入库" prop="joinCode">
+              <el-form-item label="库存管理方式" prop="joinCode">
                 <el-radio-group v-model="step1Form.joinCode">
-                  <el-radio :label="true">关联条码</el-radio>
-                  <el-radio :label="false">不关联条码</el-radio>
+                  <el-radio label="NO">不管理</el-radio>
+                  <el-radio label="CODE">管条码</el-radio>
+                  <el-radio label="NUM">管数量</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>