zhaoke vor 3 Jahren
Ursprung
Commit
40c4bd39cb

+ 2 - 2
src/layout/components/TagsView/index.vue

@@ -6,12 +6,12 @@
         <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
-    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
+    <!-- <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
       <li @click="refreshSelectedTag(selectedTag)">Refresh</li>
       <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">Close</li>
       <li @click="closeOthersTags">Close Others</li>
       <li @click="closeAllTags(selectedTag)">Close All</li>
-    </ul>
+    </ul> -->
   </div>
 </template>
 

+ 4 - 4
src/views/authorityManagement/components/authorityAppAdd.vue

@@ -55,13 +55,13 @@
             <div class="flex" v-for="(domain, index) in dynamicValidateForm.domains" :key="index">
               <div class="flex-wrap">
                 <el-form-item label="参数名称" :prop="'domains.' + index + '.name'">
-                  <el-input placeholder="请输入参数名称" v-model.trim="domain.AppInputName"></el-input>
+                  <el-input placeholder="请输入最大64位参数名称" maxlength="64" v-model.trim="domain.AppInputName"></el-input>
                 </el-form-item>
                 <el-form-item label="参数类型" :prop="'domains.' + index + '.type'">
-                  <el-input placeholder="请输入参数类型" v-model.trim="domain.AppInputType"></el-input>
+                  <el-input placeholder="请输入最大8位参数类型" maxlength="8" v-model.trim="domain.AppInputType"></el-input>
                 </el-form-item>
                 <el-form-item label="参数位置" :prop="'domains.' + index + '.place'">
-                  <el-input placeholder="请输入参数位置" v-model.trim="domain.AppInputSite"></el-input>
+                  <el-input placeholder="请输入最大8位参数位置" maxlength="8" v-model.trim="domain.AppInputSite"></el-input>
                 </el-form-item>
               </div>
               <div>
@@ -111,7 +111,7 @@ export default {
           { required: true, message: "请输入应用名称", trigger: "blur" },
           { validator: lengthValidator, max: 32, message: '长度在 1 到 32 个字符', trigger: ['change', 'blur'] }
         ],
-        url: [{ validator: lengthValidator, max: 128, message: '长度在 1 到 128 个字符', trigger: ['change', 'blur'] }],
+        url: [{ validator: lengthValidator, max: 512, message: '长度在 1 到 512 个字符', trigger: ['change', 'blur'] }],
         desc: [
           // { required: true, message: "请输入描述", trigger: "blur" },
           { validator: lengthValidator, max: 128, message: '长度在 1 到 128 个字符', trigger: ['change', 'blur'] }

+ 3 - 3
src/views/authorityManagement/components/authorityAppEdit.vue

@@ -61,13 +61,13 @@
             <div class="flex" v-for="(domain, index) in dynamicValidateForm.domains" :key="index">
               <div class="flex-wrap">
                 <el-form-item label="参数名称" :prop="'domains.' + index + '.name'">
-                  <el-input placeholder="请输入参数名称" v-model.trim="domain.AppInputName"></el-input>
+                  <el-input placeholder="请输入最大64位参数名称" maxlength="64" v-model.trim="domain.AppInputName"></el-input>
                 </el-form-item>
                 <el-form-item label="参数类型" :prop="'domains.' + index + '.type'">
-                  <el-input placeholder="请输入参数类型" v-model.trim="domain.AppInputType"></el-input>
+                  <el-input placeholder="请输入最大8位参数类型" maxlength="8" v-model.trim="domain.AppInputType"></el-input>
                 </el-form-item>
                 <el-form-item label="参数位置" :prop="'domains.' + index + '.place'">
-                  <el-input placeholder="请输入参数位置" v-model.trim="domain.AppInputSite"></el-input>
+                  <el-input placeholder="请输入最大8位参数位置" maxlength="8" v-model.trim="domain.AppInputSite"></el-input>
                 </el-form-item>
               </div>
               <div>

+ 6 - 5
src/views/staffManagement/compontents/staffAdd.vue

@@ -224,11 +224,13 @@ export default {
     //监听上级组织数据
     dataList: {
       handler (val) {
-        this.data = [val];
         if (this.orgTypes == 'org') {
           this.orgCheckedKeys = [this.OrganId];
-          this.getJobListByOrgan(this.OrganId);
+          // this.getJobListByOrgan(this.OrganId);
         }
+        const arr = [val];
+        this.decompose(arr);
+        this.data = arr;
       },
       deep: true,
     },
@@ -294,9 +296,8 @@ export default {
     //获取指定数据
     decompose (data, id) {
       for (let i = 0; i < data.length; i++) {
-        if (data[i].OrganId == id) {
-          this.dataObj = data[i];
-        } else if (data[i].children && data[i].children.length > 0) {
+        data[i]['status'] == 1 ? '' : data[i]['disabled'] = true;
+        if (data[i].children && data[i].children.length > 0) {
           this.decompose(data[i].children, id);
         }
       }

+ 0 - 2
src/views/staffManagement/compontents/staffEdit.vue

@@ -328,8 +328,6 @@ export default {
             })
             this.userGroupKeys = datas;
             this.GroupIds = datas;
-          } else {
-            this.GroupIds = ['default'];
           }
           if (UserList && UserList.length) {
             const datas = [];