2213980799@qq.com 1 год назад
Родитель
Сommit
f0b386c7a9

+ 1 - 1
src/views/factoryModel/station/components/ProductModal.vue

@@ -187,7 +187,7 @@ export default {
           showOverflowTooltip: true,
           minWidth: 110,
           formatter: (_row) => {
-            return _row.position[0].pathName;
+            return _row.position[0]&&_row.position[0].pathName;
           }
         },
         {

+ 14 - 1
src/views/system/organization/components/org-user-edit.vue

@@ -31,7 +31,7 @@
           <el-form-item label="负责部门:">
             <el-cascader
               class="ele-block"
-              :options="organizationList"
+              :options="organization"
               placeholder="请选择负责部门"
               :props="defaultProps"
               ref="deptRef"
@@ -1307,6 +1307,9 @@ export default {
     styleResponsive() {
       return this.$store.state.theme.styleResponsive;
     },
+    organization() {
+      return this.setList(this.organizationList);
+    },
     identityPhotosColumns() {
       return [
         {
@@ -1729,6 +1732,15 @@ export default {
     console.log(this.institutionList, '========');
   },
   methods: {
+    setList(list) {
+      return list.map((val) => {
+        val['disabled'] = val.id == this.form.groupId;
+        if(val.children){
+          val.children= this.setList(val.children)
+        }
+        return val;
+      });
+    },
     addIdentityPhotos() {
       this.form.identityPhotos.push({
         holder: this.form.name
@@ -1843,6 +1855,7 @@ export default {
           return (this.form.groupName = i.name);
         }
       });
+      this.form.deptIds=this.form.deptIds.filter(item=>item!=this.form.groupId)
       console.log(this.form.groupName);
     },
     getLabelName(data, callback) {

+ 1 - 1
src/views/system/user/components/user-edit.vue

@@ -9,7 +9,7 @@
     :title="isUpdate ? '修改用户' : '新建用户'"
     @update:visible="updateVisible"
   >
-    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+    <el-form ref="form" :autoComplete="false" :model="form" :rules="rules" label-width="100px">
       <el-row>
         <el-col :span="12">
           <el-form-item label="用户账号:" prop="loginName">

+ 1 - 0
src/views/system/user/components/user-search.vue

@@ -5,6 +5,7 @@
     class="ele-form-search"
     @keyup.enter.native="search"
     @submit.native.prevent
+    :autoComplete="false"
   >
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">