Merge branch 'master' of http://gitea.yxtsoft.com/yxt_group/supervise

warehousing-system/project_web_ui/src/layout/components/Sidebar/index.vue

@@ -39,7 +39,7 @@
             component: "pictureList",
             meta: {
               icon: "el-icon-menu",
-              title: "仓库列表",
+              title: "云仓列表",
             },
             name: "/pictureList/pictureList",
             path: "/pictureList/pictureList"
@@ -227,7 +227,7 @@
                 component: "stockList",
                 meta: {
                   icon: "el-icon-help",
-                  title: "库存管理",
+                  title: "库存信息",
                 },
                 name: "/stockManagement/stockList",
                 path: "/stockManagement/stockList",

warehousing-system/project_web_ui/src/router/modules/codemenu.js

@@ -49,7 +49,7 @@ const codemenu = [{
     component: () => import('@/views/component/pictureList/pictureList.vue'),
     name: 'pictureList',
     meta: {
-      title: '仓库列表',
+      title: '云仓列表',
       noCache: true
     }
   }]
@@ -155,7 +155,7 @@ const codemenu = [{
     component: () => import('@/views/component/stockManagement/stockList.vue'),
     name: 'stockList',
     meta: {
-      title: '库存管理',
+      title: '库存信息',
       noCache: true
     }
   }]

warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue

@@ -105,7 +105,7 @@
                  </el-option>
                </el-select>
               </el-form-item>
-            </el-col> -->
+            </el-col> --> 
 
             <el-col :span="4" class="trightb">
               <el-form-item class="trightb_item">

warehousing-system/project_web_ui/src/views/component/pictureList/pictureList.vue

@@ -2,7 +2,7 @@
   <div app-container>
    <div class="warehouse">
     <div v-show="viewState == 1">
-      <button-bar ref="btnbar" view-title="仓库信息表" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <button-bar ref="btnbar" view-title="云仓信息表" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="main-content">
         <div
           class="pictureList"

warehousing-system/project_web_ui/src/views/component/pictureList/pictureParticulars.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
       <div class="tab-header webtop">
-        <div>仓库列表详情</div>
+        <div>云仓列表详情</div>
         <div>
           <el-button type="info" size="small" @click="handleReturn()"
             >返回</el-button

warehousing-system/project_web_ui/src/views/component/stockManagement/stockList.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="app-container">
    <div>
-    <button-bar ref="btnbar" view-title="库存管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+    <button-bar ref="btnbar" view-title="库存信息" :btndisabled="btndisabled" @btnhandle="btnHandle" />
     <div class="main-content">
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>