Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

src/components/orgTree/index.vue

@@ -45,7 +45,7 @@
 </template>
 
 <script>
-
+import { mapGetters, mapMutations } from "vuex";
 export default {
   name: "orgTree",
   data() {
@@ -94,10 +94,17 @@ export default {
     defaultProps(val) {
       this.defaultProps = { ...val };
     },
+    orgTree(val)
+    {
+      this.getDeptTree();
+    },
   },
   created() {
     this.getDeptTree();
   },
+  computed:{
+    ...mapGetters(["orgTree"]),
+  },
   methods: {
     /** 下穿状态改变*/
     changeCheckBox(state) {

src/views/safetycheck/ruleManager/dialog.editItem.vue

@@ -57,10 +57,10 @@
         </div>
       </div>
 
-      <span slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="onSubmit()">保 存</el-button>
-      </span>
+      </div>
     </el-dialog>
     <EditPoint
       ref="editDialog"

src/views/safetycheck/ruleManager/dialog.editPoint.vue

@@ -76,12 +76,12 @@
           </el-form-item>
         </el-form>
       </div>
-      <span slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer">
         <el-button @click="dataVisible = false">取 消</el-button>
         <el-button type="primary" @click="onSubmit()">{{
           index >= 0 ? "保 存" : "添 加"
         }}</el-button>
-      </span>
+      </div>
     </el-dialog>
   </div>
 </template>

src/views/system/dept/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <!-- <el-row :gutter="20"> -->
       <!--机构数据-->
-      <el-col :span="4" :xs="24">
+      <!-- <el-col :span="4" :xs="24"> -->
         <!-- <div class="head-container">
           <el-input
             v-model="deptName"
@@ -30,7 +30,8 @@
             :default-checked-keys="defaultKeys"
             @node-click="handleNodeClick"
           /> -->
-          <div class="tree-container">
+          <!-- <div class="tree-container"> -->
+            <layoutCom>
           <org-tree
         slot="leftBar"
         v-model="queryParams.orgId"
@@ -38,11 +39,13 @@
         @checkChange="checkChange"
         @click="handleNodeClick"
       ></org-tree>
-        </div>
-      </el-col>
+        <!-- </div> -->
+      <!-- </el-col> -->
       <!--用户数据-->
-      <el-col :span="20" :xs="24">
+      <!-- <el-col :span="20" :xs="24"> -->
         <!--    搜索条件    -->
+        <el-row slot="rightBar">
+          <el-col>
         <el-form
           :model="queryParams"
           ref="queryForm"
@@ -256,7 +259,8 @@
           @pagination="getList"
         />
       </el-col>
-    </el-row>
+      </el-row>
+      </layoutCom>
 
     <!-- 添加或修改机构对话框 -->
     <DialogCom