Sfoglia il codice sorgente

feat(org): add layer levels at the end of the identification

fix additional data generated by likeRight (e.g. /a% -> /a1)
Casper Dai 2 anni fa
parent
commit
a04410f693
1 ha cambiato i file con 24 aggiunte e 8 eliminazioni
  1. 24 8
      src/views/realm/org/index.vue

+ 24 - 8
src/views/realm/org/index.vue

@@ -80,15 +80,15 @@
               clearable
             />
             <template v-if="!node.id">
-              <span class="c-grid-form__label u-required">标识</span>
+              <span class="c-grid-form__label u-required">缩写标识</span>
               <div
                 class="has-info"
-                data-info="仅可包含数字、字母和-_符号"
+                data-info="仅可包含数字、字母"
               >
                 <el-input
                   v-model.trim="node.mark"
-                  placeholder="最多30个字符"
-                  maxlength="30"
+                  placeholder="最多20个字符"
+                  maxlength="20"
                   clearable
                 />
               </div>
@@ -204,13 +204,29 @@ export default {
           this.$selectedNode.name = this.node.name
         })
       } else {
-        addDepartment(this.node).then(({ data }) => {
+        if (!this.node.mark) {
+          this.$message({
+            type: 'warning',
+            message: '请填写缩写标识'
+          })
+          return
+        }
+        if (!/^[0-9a-zA-z]+$/.test(this.node.mark)) {
+          this.$message({
+            type: 'warning',
+            message: '缩写标识格式错误'
+          })
+          return
+        }
+        const department = { ...this.node }
+        department.mark = `${department.mark}_${this.$selectedNode ? this.$selectedNode.path.split('/').length - 1 : 1}`
+        addDepartment(department).then(({ data }) => {
           done()
           if (this.hasNodes) {
-            if (this.node.parentId) {
-              this.$refs.treeRef.append({ id: data.id, path: data.path, children: [], ...this.node }, this.$selectedNode)
+            if (department.parentId) {
+              this.$refs.treeRef.append({ id: data.id, path: data.path, children: [], ...department }, this.$selectedNode)
             } else {
-              this.$refs.treeRef.append({ id: data.id, path: data.path, children: [], ...this.node })
+              this.$refs.treeRef.append({ id: data.id, path: data.path, children: [], ...department })
             }
             if (this.$selectedVNode && !this.$selectedVNode.expanded) {
               this.$selectedComponent.handleExpandIconClick()