修改首页列表与数量

sample-form-client-ui/admin/src/components/MateralsList.vue

@@ -4,19 +4,19 @@
       <div slot="title" class="title flex aic">
         <span
           >材料列表（共{{
-            matterInfo.materals ? matterInfo.materals.length : 0
+            matterInfo.matterDatumList ? matterInfo.matterDatumList.length : 0
           }}个）</span
         >
         <span class="matter-name">事项名称：{{ matterInfo.matterName }}</span>
       </div>
       <!-- 列表 -->
       <div
-        class="materals-list flex flexwrap jcb"
-        v-if="matterInfo.materals && matterInfo.materals.length"
+        class="matterDatumList-list flex flexwrap jcb"
+        v-if="matterInfo.matterDatumList && matterInfo.matterDatumList.length"
       >
         <div
-          class="materals-item flex flexc aic"
-          v-for="v in matterInfo.materals"
+          class="matterDatumList-item flex flexc aic"
+          v-for="v in matterInfo.matterDatumList"
           :key="v.id"
           @click="handleWrite"
         >
@@ -24,15 +24,15 @@
             <img :src="api + v.preViewPath" />
           </div>
           <div class="for-short">{{ v.materialName }}</div>
-          <div class="materals-name">
+          <div class="matterDatumList-name">
             {{ v.materiaFullName }}
           </div>
           <!-- <div class="check-btn" @click.stop>点击查看二维码</div> -->
         </div>
         <div
           class="list"
-          v-for="item in row - (matterInfo.materals.length % row)"
-          v-show="matterInfo.materals.length % row > 0"
+          v-for="item in row - (matterInfo.matterDatumList.length % row)"
+          v-show="matterInfo.matterDatumList.length % row > 0"
           :key="'list' + item"
         ></div>
       </div>
@@ -62,7 +62,7 @@ export default {
     return {
       api: local.getLocal("baseUrl")
         ? local.getLocal("baseUrl") + "/"
-        : "http://192.168.0.98:11074/",
+        : "http://192.168.0.98:11078",
       row: 5,
     };
   },
@@ -116,7 +116,7 @@ export default {
     white-space: nowrap;
   }
 }
-.materals-list {
+.matterDatumList-list {
   width: 100%;
   height: 100%;
   align-content: flex-start;
@@ -129,7 +129,7 @@ export default {
     overflow: hidden;
   }
 }
-.materals-item {
+.matterDatumList-item {
   width: 19%;
   margin-top: 40px;
   // height: 430px;
@@ -154,7 +154,7 @@ export default {
     text-overflow: ellipsis;
     white-space: nowrap;
   }
-  .materals-name {
+  .matterDatumList-name {
     font-size: 18px;
     font-family: Source Han Sans CN;
     color: #777777;

sample-form-client-ui/admin/src/pages/searchpage/SearchPage.vue

@@ -7,7 +7,7 @@
       <PageTop>
         <div slot="count" class="count">
           共计<span class="data-count">{{ matterTotal }}</span
-          >件事项，<span class="data-count">{{ materals.total }}</span
+          >件事项，<span class="data-count">{{ matterDatumTotal }}</span
           >份表单
         </div>
         <SearchBox
@@ -22,22 +22,22 @@
         <div class="matter-list" v-if="matterList.length">
           <div
             class="matter-item"
-            v-for="v in matterList"
-            :key="v.id"
-            @click="handleCheck(v)"
+            v-for="matter in matterList"
+            :key="matter.id"
+            @click="handleCheck(matter)"
           >
-            <div class="for-short">{{ v.matterName }}</div>
+            <div class="for-short" v-html="matter.matterName"></div>
             <div class="name">
-              {{ v.matterFullName }}
+              {{ matter.matterFullName }}
             </div>
             <div
               class="materials"
-              v-for="(item, index) in v.materals"
+              v-for="(item,index) in matter.matterDatumList"
               :key="item.id"
             >
               ·{{ item.materiaFullName }}
-              <span v-if="index > 2">{{
-                `等${v.materals && v.materals.length}份材料`
+              <span v-if="index>2">{{
+                `等${matter.matterDatumList && matter.matterDatumList.length}份材料`
               }}</span>
             </div>
           </div>
@@ -78,7 +78,7 @@ import Header from "@/components/Header.vue";
 import PageTop from "@/components/PageTop.vue";
 import SearchBox from "@/components/SearchBox.vue";
 import MateralsList from "@/components/MateralsList.vue";
-import { getWriteMatterList, getMaterialsList } from "@/api";
+import { getWriteMatterList } from "@/api";
 export default {
   components: {
     Header,
@@ -96,19 +96,20 @@ export default {
       matterInfo: {},
       visible: false,
       matterTotal: 0,
+      matterDatumTotal: 0,
       matterList: [], // 事项列表
-      materals: [], // 所有材料列表
+      matterDatumList: [], // 所有材料列表
     };
   },
   created() {
     this.getWriteMatterList();
-    this.getAllmaterials();
+   // this.getAllmaterials();
   },
   watch: {
     searchVal(newVal) {
       if (newVal === "") {
         this.getWriteMatterList();
-        this.getAllmaterials();
+      //  this.getAllmaterials();
       }
     },
   },
@@ -121,19 +122,20 @@ export default {
         matterName: this.searchVal,
       });
       let { total, data } = res.data.data;
-      data.forEach(async (v) => {
-        v.materals = [];
-        let obj = await this.getMaterialsList(1, -1, v.id);
-        obj.data.forEach((item) => {
-          v.materals.push(item);
-        });
-      });
+      // data.forEach(async (v) => {
+      //   v.matterDatumList = [];
+      //   let obj = await this.getMaterialsList(1, -1, v.id);
+      //   obj.data.forEach((item) => {
+      //     v.matterDatumList.push(item);
+      //   });
+      // });
       this.matterList = data;
+     // this.matterDatumList=data.matterDatumList
       this.matterTotal = total;
     },
     // 获取所有材料
-    async getAllmaterials() {
-      this.materals = await this.getMaterialsList(1, 3, null, this.searchVal);
+   /* async getAllmaterials() {
+      this.matterDatumList = await this.getMaterialsList(1, 3, null, this.searchVal);
     },
     // 获取材料列表
     async getMaterialsList(page = 1, size = 3, matterId, materialName) {
@@ -148,11 +150,11 @@ export default {
         total,
         data,
       };
-    },
+    },*/
     // 搜索
     handleSearch() {
       this.getWriteMatterList();
-      this.getAllmaterials();
+     // this.getAllmaterials();
     },
     // 分页
     changePage(cur) {

sample-form-client-ui/admin/src/pages/showpage/MatterList.vue

@@ -33,7 +33,7 @@
                 :key="v.id"
                 @click="handleCheck(v)"
             >
-              <div class="for-short">{{ v.matterName }}</div>
+              <div class="for-short" v-html="v.matterName"></div>
               <div class="name">事项名称：{{ v.matterFullName }}</div>
             </div>
           </div>
@@ -69,7 +69,7 @@ import LeftMenus from "./components/LeftMenus.vue";
 import PageTop from "@/components/PageTop.vue";
 import SearchBox from "@/components/SearchBox.vue";
 import MateralsList from "../../components/MateralsList.vue";
-import {getWriteMatterList, getMaterialsList} from "@/api";
+import {getWriteMatterList} from "@/api";
 
 export default {
   components: {
@@ -94,7 +94,7 @@ export default {
   },
   created() {
     this.getWriteMatterList();
-    this.getAllmaterials();
+   // this.getAllmaterials();
   },
   watch: {
     searchVal(newVal) {
@@ -125,7 +125,7 @@ export default {
       this.matterList = data;
       this.matterTotal = total;
     },
-    // 获取材料
+   /* // 获取材料
     async getAllmaterials() {
       this.materals = await this.getMaterialsList(1, 3, null);
     },
@@ -142,13 +142,13 @@ export default {
         total,
         data,
       };
-    },
+    },*/
     // 切换部门
     changeDept(deptCode) {
       this.deptCode = deptCode;
       this.current = 1;
       this.getWriteMatterList();
-      this.getAllmaterials();
+      //this.getAllmaterials();
     },
     // 分页
     changePage(cur) {
@@ -156,7 +156,9 @@ export default {
       this.getWriteMatterList();
     },
     handleCheck(row) {
+      console.log("onclick row",row)
       this.matterInfo = row;
+      console.log("lens",this.matterInfo.matterDatumList.length)
       this.visible = true;
     },
   },

sample-form-client-ui/admin/src/pages/showpage/ShowMaterials.vue

@@ -109,7 +109,7 @@ export default {
     return {
       api: local.getLocal("baseUrl")
         ? local.getLocal("baseUrl") + "/"
-        : "http://192.168.0.98:11074",
+        : "http://192.168.0.98:11078",
       matterInfo: this.$route.query,
       materailsList: [],
       active: 0,
@@ -121,6 +121,11 @@ export default {
   },
   created() {
     this.getMaterialsList();
+
+    console.log("matterDatumList",this.matterInfo.matterDatumList)
+
+   // this.materailsList=this.matterInfo.matterDatumList;
+
   },
 
   methods: {