Merge remote-tracking branch 'origin/master'

src/views/basic/product/product.vue

@@ -2,8 +2,8 @@
   <div>
     <el-card>
       <el-row type="flex">
-        <el-col v-show="showSearch" style="width: 300px">
-          <div style="height: 100%">
+        <el-col style="flex: 1" v-show="Dictionary">
+          <el-col v-show="showSearch" style="min-width: 200px; max-width: 100%">
             <el-tree
               :data="treeList"
               class="tree"
@@ -17,8 +17,24 @@
                 }}</span></span
               >
             </el-tree>
-          </div>
+          </el-col>
         </el-col>
+        <el-button
+          type="success"
+          @click="Dictionary = !Dictionary"
+          icon="el-icon-arrow-left"
+          v-show="Dictionary"
+          class="iconButton"
+        >
+        </el-button>
+        <el-button
+          type="success"
+          @click="Dictionary = !Dictionary"
+          icon="el-icon-arrow-right"
+          v-show="!Dictionary"
+          class="iconButton"
+        >
+        </el-button>
         <el-col style="border-left: 3px solid #dddddd; overflow-y: hidden">
           <el-form
             :model="filterQuery"
@@ -1460,6 +1476,7 @@ import { getBasicHospType, getListTree } from "@/api/basic/basicHospType";
 export default {
   data() {
     return {
+      Dictionary: false, //物资字典分类显示、隐藏
       filterQuery: {
         lockStatus: null,
         unionCode: null,
@@ -2100,6 +2117,10 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+.iconButton {
+  margin-left: 0px;
+  height: 30px;
+}
 .tree {
   ::v-deep .el-tree-node {
     white-space: normal;