src/components/old-adm/ledger/components/handsontables/system.vue

@@ -370,7 +370,9 @@ export default {
             if (this.addData.category) {
                 this.$router.push({
                     path: "/ledger/systemadd",
-                    query: this.addData,
+                    query: {
+                        ...this.addData,
+                    }
                 });
             }
         },
@@ -378,14 +380,13 @@ export default {
         changeAddType(val) {
             this.addData.category = val.classCode;
             this.addData.categoryName = val.categoryName;
-            this.addData.showType = this.showType;
-            console.log("val", val, this.addData);
+            this.addData.showType = val.isDelivery;
+            // this.addData.showType = this.showType;
         },
         /**
          * 切换信息点查看类型
          */
         handleChangeShowType() {
-            console.log(123)
             this.showInfoList = [];
             this.initTable();
         },

src/components/old-adm/ledger/components/lib/system.vue

@@ -46,7 +46,8 @@ export default {
         value: "classCode",
         label: "categoryName"
       },
-      isDelivery: true
+      isDelivery: true,
+      query: {},
     };
   },
   created() {
@@ -76,8 +77,9 @@ export default {
           value = item
         }
       })
-      this.value = val
-      this.$emit("change", value)
+      this.value = val;
+      this.query = {...this.query, ...value};
+      this.$emit("change", this.query)
     },
     async getData() {
       let param = {
@@ -126,8 +128,9 @@ export default {
       return data;
     },
     deliverChange(val) {
-
-      this.options = val ? this.full_options.filter(item => item?.isDelivery) : this.full_options
+      this.query = {...this.query, isDelivery: val ? 'Visible' : 'all'};
+      this.options = val ? this.full_options.filter(item => item?.isDelivery) : this.full_options;
+      this.$emit("change", this.query)
     }
   }
 };

src/components/old-adm/ledger/system/addsystem.vue

@@ -6,7 +6,7 @@
       </el-col>
       
       <el-col span="20" style="text-align: right">
-        <el-select v-model="showType" @change="initTable" style="width:125px;margin-right:10px;vertical-align:bottom;">
+        <el-select :disabled='showType === "all"' v-model="showType" @change="initTable" style="width:125px;margin-right:10px;vertical-align:bottom;">
           <el-option v-for="item in showTypes" :key="item.value" :label="item.label" :value="item.value"></el-option>
         </el-select>
         <span>增加</span>
@@ -120,6 +120,7 @@ export default {
   },
   created() {
     this.category = this.$route.query;
+
     this.getBuildData();
     this.getTableHeader();
   },

src/components/old-adm/relation/overview/index.vue

@@ -1,5 +1,12 @@
 <template>
   <div style="overflow: hidden auto" v-loading="loading">
+    
+    <div style="text-align: right; margin: 8px; user-select:none;">
+        <a  style="text-decoration: underline; cursor: pointer" @click="toggleRelation">
+          {{currentRelation === 'deliver' ?  '显示数据字典中的全部关系' : '只显示项目要交付的关系' }}
+        </a>
+    </div>
+    <!-- <Divider style="height: 0.5px" /> -->
     <cardList
       :content="content"
       :source="source"
@@ -46,6 +53,7 @@ export default {
       currentRelationTypeName: "", //当前点击卡片的RelationTypeName
       TableVisibleMoreLoading: false,
       computingNum: 0, //正在计算的关系数量
+      currentRelation: 'deliver'    //当前所展示的关系 all： 全部关系， deliver： 交付关系
     };
   },
   created() {
@@ -66,6 +74,10 @@ export default {
     CardList 
   },
   methods: {
+    toggleRelation() {
+      
+      this.currentRelation = this.currentRelation === 'deliver' ? 'all' : 'deliver'
+    },
     init() {
       this.loading = true;
       let dataNumber = {

src/controller/old-adm/dicController.ts

@@ -57,18 +57,6 @@ class Dic {
     );
     return fn ? fn(res) : res;
   }
-  /**
-   * @description: 查询项目下类型的信息点
-   * @param {*}
-   * @return {*}
-   */  
-  static async getDataDictionary(params, fn) {
-    const res = await Dic.http.postRequest(
-      dict_pre + '/query',
-      params,
-    )
-    return fn ? fn(res) : res
-  }
 }
 
 export default Dic;

src/meri.js

@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import {Button, Input, MSelect, Icon, Popover, ImageUpload, Modal} from 'meri-design'
+import {Button, Input, MSelect, Icon, Popover, ImageUpload, Modal, Divider} from 'meri-design'
 
 Vue.use(Button)
 Vue.use(Input)
@@ -8,3 +8,4 @@ Vue.use(Icon)
 Vue.use(Popover)
 Vue.use(ImageUpload)
 Vue.use(Modal)
+Vue.use(Divider)