数据 字典

pages/basicData/dic/index.vue

@@ -156,9 +156,13 @@
         >
       </div>
       <Modal v-model="editModal" :title="editTitle" footer-hide>
-        <component :is="datail" :v="editModel" @on-close="editModal = false" @on-ok="editOk" />
+        <component
+          :is="datail"
+          :v="editModel"
+          @on-close="editModal = false"
+          @on-ok="editOk"
+        />
       </Modal>
-     
     </Content>
   </Layout>
 </template>
@@ -174,7 +178,7 @@ const root = {
 export default {
   data() {
     return {
-      datail:null,
+      datail: null,
       addTitle: "新增",
       addModal: false,
       keys: "",
@@ -185,10 +189,7 @@ export default {
       editModel: {
         color: "",
       },
-      nodeInfo: {
-        priority: null,
-        id: 0,
-      },
+
       editTitle: "编辑",
       node: root,
       color4: "",
@@ -332,12 +333,17 @@ export default {
               },
             },
             [
-              h("State",{props:{
-                value:data.data.typeId,
-                code:"aps.scheduling.groupingForm",
-                type:"tag"
-              }},data.data.typeId)
-              ,
+              h(
+                "State",
+                {
+                  props: {
+                    value: data.data.typeId,
+                    code: "system.dictionary.typeId",
+                    type: "tag",
+                  },
+                },
+                data.data.typeId
+              ),
               h(
                 "span",
                 {
@@ -352,11 +358,12 @@ export default {
                       this.$refs.contentMenu.currentVisible = !this.$refs
                         .contentMenu.currentVisible;
                       this.editModel = data.data;
-                      console.warn("addd",this.editModel)
+                      console.warn("addd", this.editModel);
                     },
                   },
                 },
-                data.title+" ["+data.data.typeId+"]"
+                data.title
+                // +" ["+data.data.typeId+"]"
               ),
             ]
           ),
@@ -378,13 +385,13 @@ export default {
       });
     },
     editRight() {
-      this.editRow(this.nodeInfo);
+      this.editRow(this.editModel);
     },
     editRow(row, index) {
       this.editTitle = "编辑";
       this.editModal = true;
       this.editModel = row;
-      this.datail=()=>import("./components/edit");
+      this.datail = () => import("./components/edit");
     },
     toggle() {
       this.expand = !this.expand;
@@ -394,26 +401,26 @@ export default {
       this.load();
       this.loadTree();
       this.addModal = false;
-      this.detail=null;
+      this.detail = null;
     },
     add(upId) {
-      if(upId==0){
-        this.editModel={
-          id:-1,
-        upId: this.node.id,
-        name: "",
-        code: "",
-        color: "",
-        status: 0,
-        isStatic: 0,
-        typeId: -1,
-        priority: this.edit,
-        }
+      if (upId == 0) {
+        this.editModel = {
+          // id:-1,
+          upId: 0,
+          name: "",
+          code: "",
+          color: "",
+          status: 0,
+          isStatic: 0,
+          typeId: 0,
+          priority: this.edit,
+        };
         // console.warn("VVVVVVVVVVVVVVVVV")
       }
-      this.datail=()=>import("./components/add");
+
+      this.datail = () => import("./components/add");
       this.editModal = true;
-      
     },
 
     editOk() {
@@ -421,7 +428,7 @@ export default {
       this.editModal = false;
     },
     removeNew() {
-      this.delRow(this.nodeInfo);
+      this.delRow(this.editModel);
     },
     delRow(row, index) {
       var url = `${systemUrl}/Dictionary/Delete?id=${row.id}`;