Merge branch 'master' of http://120.26.64.82:3000/BFFE/Foshan4A4.0

src/views/authorityManagement/components/authorityPowerAdd.vue

@@ -48,7 +48,7 @@
           <Rulesofcompetency @getData="getData" :authTo="authTo" title="权限规则" />
         </div>
         <div v-is="['authtree_role_card']" class="flex1 part">
-          <Rolelist @checkChange="checkChange" :roleType="roleType" :checkBoxList="checkBoxList" :number="8" title="角色" />
+          <Rolelist @checkChange="checkChange" :roleType="roleType" needType="1" :checkBoxList="checkBoxList" :number="8" title="角色" />
         </div>
       </template>
       <!--有岗位-->

src/views/authorityManagement/components/authorityPowerEdit.vue

@@ -48,7 +48,7 @@
           <Rulesofcompetency @getData="getData" :authTo="authTo" title="权限规则" />
         </div>
         <div v-is="['appupdate_edit_card']" class="flex1 part">
-          <Rolelist @checkChange="checkChange" :roleType="roleType" :checkBoxList="checkBoxList" :number="8" title="角色" />
+          <Rolelist @checkChange="checkChange" :roleType="roleType" needType="1" :checkBoxList="checkBoxList" :number="8" title="角色" />
         </div>
       </template>
       <!--有岗位-->

src/views/staffManagement/compontents/staffHome.vue

@@ -32,13 +32,13 @@
                     <i @click="checkRemove(item,index)" class="icon el-icon-close"></i>
                   </div>
                 </div>
-                <div class="flex time">
-                  <div class="time-msg flex1">所属组织：<span :title="item.OrganName" class="glr">{{item.OrganName}}</span></div>
-                </div>
                 <div class="flex ip">
                   <div class="time-info flex1">职务名称：<span :title="item.JobName" class="glr">{{item.JobName ? item.JobName : '暂无'}}</span></div>
                   <!-- <div class="ip-info flex1">是否有副岗：<span class="glr">{{item.HasDepJob == 1 ? '是':'否'}}</span></div> -->
                 </div>
+                <div class="flex time">
+                  <div class="time-msg flex1">所属组织：<span :title="item.OrganName" class="glr">{{item.OrganName}}</span></div>
+                </div>
                 <div class="flex ip">
                   <div class="ip-msg flex1">登录名：<span :title="item.LoginName" class="glr">{{item.LoginName}}</span></div>
                   <div style="margin-right:20px;" class="power">权限：<span class="glr">{{item.AuthCount}}</span></div>

src/views/systemManagement/EditSystem/index.vue

@@ -293,7 +293,10 @@ export default {
     },
     save() {
       let that = this;
-      let ipArr = this.FormData.IpList.split(";");
+      let ipArr = [];
+      if (this.FormData.IpList) {
+        ipArr = this.FormData.IpList.split(";");
+      }
       let isSave = true;
       if (ipArr.length >= 2) {
         ipArr.forEach((item) => {

src/views/systemManagement/addSystem/index.vue

@@ -279,7 +279,10 @@ export default {
     },
     save() {
       let that = this;
-      let ipArr = this.FormData.IpList.split(";");
+      let ipArr = [];
+      if (this.FormData.IpList) {
+        ipArr = this.FormData.IpList.split(";");
+      }
       let isSave = true;
       if (ipArr.length >= 2) {
         ipArr.forEach((item) => {