Merge remote-tracking branch 'origin/master'

sample-form-client-ui/admin/src/api/index.js

 // 事项api
-import local from "@/utils/local"
-import request from '@/utils/request'
+import local from "@/utils/local";
+import request from "@/utils/request";
 
 //let baseUrl = local.getLocal('baseUrl') ? local.getLocal('baseUrl') : 'http://localhost:17002'
-let baseUrl = local.getLocal('baseUrl') ? local.getLocal('baseUrl') : 'http://192.168.0.98:11078'
-let siteId = local.getLocal('siteId') ? local.getLocal('siteId') : '3'
-let devicenum = local.getLocal('devicenum') ? local.getLocal('devicenum') : '90-2B-34-BF-1B-48'
+let baseUrl = local.getLocal("baseUrl")
+  ? local.getLocal("baseUrl")
+  : "http://192.168.0.98:11078";
+let siteId = local.getLocal("siteId") ? local.getLocal("siteId") : "3";
+let devicenum = local.getLocal("devicenum")
+  ? local.getLocal("devicenum")
+  : "90-2B-34-BF-1B-48";
 // 首页数据展示
 export const getHomeInfo = (data) => {
-    return request({
-        url: `${baseUrl}/sampleform/home/info`,
-        method: "post",
-        data: {
-            siteId,
-            devicenum,
-            ...data
-        },
-    });
+  return request({
+    url: `${baseUrl}/sampleform/home/info`,
+    method: "post",
+    data: {
+      siteId,
+      devicenum,
+      ...data,
+    },
+  });
 };
 
 // 获取部门列表
 export const getdeptList = (data) => {
-    return request({
-        url: `${baseUrl}/sampleform/home/dept/list`,
-        method: "post",
-        data: {
-            siteId,
-            ...data
-        },
-    });
+  return request({
+    url: `${baseUrl}/sampleform/home/depts`,
+    method: "post",
+    data: {
+      siteId,
+      ...data,
+    },
+  });
 };
 
 // 查询事项列表
 export const getWriteMatterList = (data) => {
-    return request({
-        url: `${baseUrl}/sampleform/matter/list`,
-        method: "post",
-        data: {
-            siteId,
-            ...data
-        },
-    });
+  return request({
+    url: `${baseUrl}/sampleform/matter/list`,
+    method: "post",
+    data: {
+      siteId,
+      ...data,
+    },
+  });
 };
 
 //   查询材料列表
 export const getMaterialsList = (data) => {
-    return request({
-        url: `${baseUrl}/sampleform/matter/datum/list`,
-        method: "post",
-        data: {
-            siteId,
-            ...data
-        },
-    });
+  return request({
+    url: `${baseUrl}/sampleform/matter/datum/list`,
+    method: "post",
+    data: {
+      siteId,
+      ...data,
+    },
+  });
 };
 
 // 表单合成
 export const mergeFormToDocx = (data) => {
-    return request({
-        url: `${baseUrl}/sampleform/home/mergeFormToDocx`,
-        method: "post",
-        data: {
-            siteId,
-            ...data
-        },
-    });
-};
+  return request({
+    url: `${baseUrl}/sampleform/home/mergeFormToDocx`,
+    method: "post",
+    data: {
+      siteId,
+      ...data,
+    },
+  });
+};
\ No newline at end of file

sample-form-client-ui/admin/src/assets/css/common.css

@@ -369,4 +369,22 @@
     background: #dfe9fb;
     border-radius: 4px;
     color: var(--main-theme-color1);
+}
+.scroll3 {
+    overflow-y: auto;
+}
+
+.scroll3::-webkit-scrollbar {
+    width: 3px;
+    overflow-y: auto;
+}
+
+.scroll3::-webkit-scrollbar-thumb {
+    border-radius: 3px;
+    background-color: rgba(144, 147, 153, 0.5);
+}
+
+.scroll3::-webkit-scrollbar-track {
+    border-radius: 3px;
+    background: #fff;
 }
\ No newline at end of file

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

@@ -105,16 +105,16 @@ export default {
   position: relative;
   overflow-y: auto;
   &::-webkit-scrollbar {
-    width: 12px;
+    width: 3px;
     overflow-y: auto;
   }
 
   &::-webkit-scrollbar-thumb {
-    border-radius: 6px;
+    border-radius: 3px;
     background-color: rgba(144, 147, 153, 0.5);
   }
   &::-webkit-scrollbar-track {
-    border-radius: 6px;
+    border-radius: 3px;
     background: #fff;
   }
 }

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

@@ -8,7 +8,7 @@
           材料全称：{{ previewInfo.materiaFullName }}
         </p>
       </div>
-      <div class="preview-img-box flex1 flex jcc aic">
+      <div class="preview-img-box scroll3 flex1 flex jcc aic">
         <img
           :src="
             previewInfo.preview

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

@@ -38,7 +38,7 @@
             ></div>
             <div class="name">
               <span class="matter-fullName">事项全称</span
-              >{{ matter.matterFullName }}
+              ><span v-html="matter.matterFullName"></span>
             </div>
             <!-- 材料展示 -->
             <!-- <div
@@ -146,7 +146,7 @@ export default {
         page: this.current,
         size: this.size,
         isTerminal: 1,
-        matterName: this.searchVal,
+        matterFullName: this.searchVal,
       });
       let { total, matterDatumTotal, data } = res.data.data;
       this.matterList = data;

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

@@ -8,7 +8,7 @@
         返回首页
       </div>
     </Header>
-    <div class="main flex1 flex jcc">
+    <div class="main flex1 flex jcc scroll3">
       <div
         class="preview-box flex flexc aic"
         v-for="(v, i) in materailsList"
@@ -63,7 +63,7 @@
             {{ matterInfo.matterName }}
           </div>
           <!-- 材料列表 -->
-          <div class="materails-list">
+          <div class="materails-list scroll3">
             <div
               class="materails-item pdl10"
               v-ellipsis="'330px'"
@@ -184,20 +184,6 @@ export default {
 .main {
   width: 100%;
   position: relative;
-  overflow: auto;
-  &::-webkit-scrollbar {
-    width: 12px;
-    overflow-y: auto;
-  }
-
-  &::-webkit-scrollbar-thumb {
-    border-radius: 6px;
-    background-color: rgba(144, 147, 153, 0.5);
-  }
-  &::-webkit-scrollbar-track {
-    border-radius: 6px;
-    background: #fff;
-  }
   .sidebar-box {
     width: 360px;
     min-height: 340px;
@@ -212,20 +198,6 @@ export default {
     transition: all 500ms;
     .materails-list {
       max-height: 600px;
-      &::-webkit-scrollbar {
-        width: 6px;
-        overflow-y: auto;
-      }
-
-      &::-webkit-scrollbar-thumb {
-        border-radius: 6px;
-        background-color: rgba(144, 147, 153, 0.5);
-      }
-
-      &::-webkit-scrollbar-track {
-        border-radius: 6px;
-        background: #fff;
-      }
     }
     .title {
       margin-bottom: 15px;

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

 <template>
   <div class="left-menus">
-    <div class="dept-list">
+    <div class="dept-list scroll3">
       <div
         class="dept-item"
         :class="{ active: isActive === i }"
         v-for="(v, i) in deptList"
-        :key="v.deptNumber"
-        @click="changeDept(v.deptNumber, i)"
+        :key="v.deptCode"
+        @click="changeDept(v.deptCode, i)"
       >
         <div class="dept-name">
           {{ v.deptAbb ? v.deptAbb : v.name }}
@@ -34,8 +34,16 @@ export default {
     async getdeptList() {
       let obj = { deptCode: "", name: "全部部门" };
       let res = await getdeptList();
-      let { data } = res.data.data;
-      this.deptList = [obj, ...data];
+      if (res.data.code === 1) {
+        let { deptMap } = res.data.data;
+        let arr = Object.keys(deptMap).map((key) => {
+          return {
+            deptCode: key,
+            name: deptMap[key],
+          };
+        });
+        this.deptList = [obj, ...arr];
+      }
     },
     changeDept(deptCode, index) {
       this.isActive = index;
@@ -56,20 +64,6 @@ export default {
   width: 100%;
   height: calc(100vh - 110px);
   padding-bottom: 15px;
-  overflow-y: auto;
-  &::-webkit-scrollbar {
-    width: 4px;
-    overflow-y: auto;
-  }
-
-  &::-webkit-scrollbar-thumb {
-    border-radius: 4px;
-    background-color: rgba(144, 147, 153, 0.5);
-  }
-  &::-webkit-scrollbar-track {
-    border-radius: 4px;
-    background: #fff;
-  }
 }
 .dept-item {
   text-align: center;