Merge remote-tracking branch 'remotes/origin/v0.0.9' into v0.1.0

 Conflicts:
	src/views/safetycheck/task/components/checkRegister.vue

src/components/orgSelect/zl.orgSelect.vue

@@ -434,6 +434,7 @@ export default {
         });
         this.boundOrgIds = this.boundOrgsClone.map((d) => d.deviceId);
         this.currentTempList= JSON.parse(JSON.stringify(initHistorySelectOrgs));
+        this.leftSearch();
         // this.currentTempList
         // this.left.data = this.searchOrgs.filter((row) => this.boundOrgIds.indexOf(row.id) < 0)
       }

src/views/safetycheck/task/components/checkRegister.vue

@@ -36,7 +36,7 @@
               <el-option
                 v-for="role in roleOptions"
                 :key="role.id"
-                :label="role.name"
+                :label="role.roleName"
                 :value="role.id"
               ></el-option>
             </el-select> </el-form-item
@@ -250,6 +250,7 @@ import { getLabel } from "@/views/commonOption.js";
 import { getNamesByOrgId, getAllNames } from "@/api/system/role.js";
 import orgDropDown from "@/components/orgTree/orgDropDown.vue";
 import { arabicToChinese } from "@/utils/util.js";
+import {getRoles} from "@/api/system/public";
 export default {
   name: "safetyCheckRegister",
   data() {
@@ -304,12 +305,7 @@ export default {
     this.taskInfo.checkOrgId = this.orgId;
     //this.taskInfo.checkRoleId = this.roleList[0].roleId;
     this.taskInfo.signImg = this.$route.params.signImg;
-    getAllNames().then((r) => {
-      this.roleOptions = r.data;
-      if (!this.roleOptions.find((op) => op.id == this.taskInfo.checkRoleId)) {
-        this.taskInfo.checkRoleId = null;
-      }
-    });
+    this.getAllRoles();
   },
   methods: {
     dayjs,
@@ -326,6 +322,18 @@ export default {
         return;
       }
       this.$refs["point_baseInfo"].clearValidate(["checkOrgId"]);
+      // getNamesByOrgId(node.id).then((r) => {
+      //   this.roleOptions = r.data;
+      //   this.prevCheckOrgType = node.type;
+      //   if (!this.roleOptions.find((op) => op.id == this.taskInfo.checkRoleId)) {
+      //     this.taskInfo.checkRoleId = null;
+      //   }
+      // });
+    },
+    getAllRoles() {
+      getRoles().then((response) => {
+        this.roleOptions = response;
+      });
     },
     onBecheckOrgSelect(node) {
       if (node == null) {

src/views/system/dept/extend.vue

@@ -254,7 +254,7 @@
             </el-descriptions-item>
           </el-descriptions> -->
 
-          <el-descriptions class="margin-top" :column="3" v-if="(type === org_type.yewd || type === org_type.zxywk)" size="medium" border>
+          <el-descriptions class="margin-top" :column="3" v-if="(type === org_type.yewd)" size="medium" border>
             <el-descriptions-item label="是否设立业务库"  :contentStyle='contentStyle' :labelStyle='labelStyle'  labelClassName="info_label_required">
               <el-radio-group v-model="businessLibrary">
                 <el-radio :label="1">是</el-radio>
@@ -1045,7 +1045,9 @@ export default {
 
     getExtendInfo() {
       getExtendByOrgId(this.$route.params.id).then((data) => {
-        console.log(data.data);
+        if (this.type === this.org_type.zxywk) {
+          this.businessLibrary = 1;
+        }
         if (data.data != null) {
           this.safeBox = data.data.safeBox;
           this.innerCount = data.data.innerCount;