Merge branch 'main' into 'stg'

Main

See merge request cloud-mediate/mediate-manage-web!44

package-lock.json

@@ -21110,6 +21110,11 @@
                 }
             }
         },
+        "watermark-dom": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmmirror.com/watermark-dom/-/watermark-dom-2.3.0.tgz",
+            "integrity": "sha512-2++fJESs8ULlrOPHEJGi72UxcDmVTsJDZ3kMa5umU6IWc78A4g1kOAqh1k6FEQhrq9QpkV7wzuoUeMhvFlWGWg=="
+        },
         "wbuf": {
             "version": "1.7.3",
             "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",

package.json

@@ -29,7 +29,8 @@
         "vue-quill-editor": "^3.0.6",
         "vue-router": "^3.1.6",
         "vuex": "^3.4.0",
-        "vuex-persistedstate": "^4.0.0-beta.3"
+        "vuex-persistedstate": "^4.0.0-beta.3",
+        "watermark-dom": "^2.3.0"
     },
     "devDependencies": {
         "@stomp/stompjs": "^5.4.4",

src/components/dialogPreview.vue

@@ -8,11 +8,11 @@
             <div slot="title">
                 <TitleBar title="预览"></TitleBar>
             </div>
-            <div  style="min-height:600px;text-align: center; " class="c-flex-center">
+            <div  style="height: 800px; text-align: center; " class="c-flex-center">
                    <!-- svg -->
                    <svgViewer :src="previewUrl" v-if="isSvg"></svgViewer>
                    <!-- 其他图片 -->
-                   <el-image  :src="previewUrl" fit="scale-down" v-else></el-image>
+                   <el-image  :src="previewUrl" fit="scale-down" v-else style="height: 100%;width: 100%;"></el-image>
             </div>
         
             <span slot="footer" class="dialog-footer">

src/pages/case-management/detail/index.vue

@@ -67,9 +67,9 @@
             </span>
           </div>
           
-          <div class="case-detail-des flex-column" v-for="(item,index) in coobligationInfo.caseList" :key="index">
+          <div class="case-detail-des flex-column" :class="index > 0 ? 'border-t-solid-lighter-1':''" v-for="(item,index) in coobligationInfo.caseList" :key="index">
             <div>
-              <span><a>案件包名称：</a><a>{{item.casePkg}}</a></span>
+              <!-- <span><a>案件包名称：</a><a>{{item.casePkg}}</a></span> -->
               <span><a>金融产品名称：</a><a>{{item.productTypeId}}</a></span>
               <span><a>金融机构名称：</a><a>{{item.financialOrgName}}</a></span>
               <span><a>案件编号：</a><a>{{item.caseNo}}</a></span>
@@ -761,9 +761,14 @@ export default {
     color: #86909C;
 
     span {
-      width: 25%;
+      width: 24%;
       display: inline-block;
       margin: 5px 0;
+      margin-right: 1%;
+
+      white-space: nowrap; /* 防止文本换行 */
+      overflow: hidden; /* 隐藏溢出的文本 */
+      text-overflow: ellipsis; /* 显示省略号 */
     }
 
     span a:first-child {
@@ -773,6 +778,10 @@ export default {
 
     span a:last-child {
       color: #1D2129;
+      width: calc(100% - 160px) !important;
+      display: inline-block;
+
+
     }
 
     .el-form-item {

src/pages/layout/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="layout-wrap">
+    <div class="layout-wrap" ref="watermarkContainer">
         <LayoutHeader />
         <div class="layout-bottom-wrap">
             <!-- <SideMenu /> -->
@@ -12,6 +12,7 @@
     </div>
 </template>
 <script>
+import watermark from 'watermark-dom';
 export default {
     components: {
         LayoutHeader: () => import('./components/LayoutHeader'),
@@ -31,6 +32,53 @@ export default {
             return this.$route.name; // 获取当前路由的名称
         }
     },
+    mounted() {
+        this.addWatermark();
+    },
+    methods: {
+        addWatermark() {
+           
+            let userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
+            let watermark_txt = userInfo.realName + ' '+ userInfo.phone
+            let options = {
+                // 水印内容
+                watermark_txt: watermark_txt,
+                // 水印起始位置x轴坐标
+                watermark_x: 20,
+                // 水印起始位置Y轴坐标
+                watermark_y: 20,
+                // 水印行数
+                watermark_rows: 5,
+                // 水印列数
+                watermark_cols: 10,
+                // 水印x轴间隔
+                watermark_x_space: 150,
+                // 水印y轴间隔
+                watermark_y_space: 150,
+                // 水印字体颜色
+                watermark_color: '#aaa',
+                // 水印透明度
+                watermark_alpha: 0.2,
+                // 水印字体大小
+                watermark_fontsize: '15px',
+                // 水印字体
+                watermark_font: '微软雅黑',
+                // 水印宽度
+                watermark_width: 210,
+                // 水印长度
+                watermark_height: 80,
+                // 水印倾斜度数
+                watermark_angle: 15
+            }
+
+            watermark.init(options);
+            // watermark.load({
+            //     watermark_txt: '水印文本',
+            //     watermark_parent_node: this.$refs.watermarkContainer,
+            //     options11
+            // });
+        },
+    },
 }
 </script>
 <style lang="scss">

src/pages/mediation-page/components/LayoutContentNew.vue

@@ -198,7 +198,7 @@
 
           <!-- 案件文书 -->
           <div v-if="leftActive == 4" class="case-office-person">
-            <cassWrit :caseId="caseId" />
+            <cassWrit :caseId="caseId" :updateUnm="updateUnmU" />
 
           </div>
 
@@ -362,6 +362,7 @@
 <script>
 import api from "@/services/caseManagement";
 import contactPerson from "@/services/contactPerson";
+import { number } from "echarts";
 export default {
   components: {
     showFile: () => import('../../../components/showFile.vue'),//
@@ -391,10 +392,17 @@ export default {
         return {}
       },
     },
+    updateUnm: {
+      type: number,
+      default: () => {
+        return 0
+      },
+    },
     
   },
   data() {
     return {
+      updateUnmU:1,
       singleremarkvisible:false,
       fileDialog:null,
       singlesmsvisible:false,
@@ -438,6 +446,13 @@ export default {
       immediate: true,
       deep: true
     },
+    updateUnm: {
+      handler(val) {
+        this.updateUnmU ++;
+      },
+      immediate: true,
+      deep: true
+    },
   },
   async created() {
     this.mediaterecordpm.caseId = this.caseId

src/pages/mediation-page/components/MediationRoom.vue

@@ -113,7 +113,7 @@
       </div>
       
       <!-- 中间数据 -->
-      <LayoutContentNew ref="layoutContent" :caseId="caseId" :thisCaseInfo="thisCaseInfo" @startOutboundCall="startOutboundCall" @updateCaseInfoById="getCaseInfoById" />
+      <LayoutContentNew ref="layoutContent" :caseId="caseId" :thisCaseInfo="thisCaseInfo" :updateUnm="updateUnm" @startOutboundCall="startOutboundCall" @updateCaseInfoById="getCaseInfoById" />
 
     </div>
 
@@ -166,7 +166,7 @@
             v-model="singleofficevisible"
             title="发起签字"
             trigger="click">
-            <singleofficeWritPopover :caseId="caseId" :singleofficevisible.sync="singleofficevisible"/>
+            <singleofficeWritPopover :caseId="caseId" :singleofficevisible.sync="singleofficevisible" @handleUpdate='getSetTimeWritCaseList'/>
             <span slot="reference" class="flex-row justify-content-between align-items-center cursor-pointer bottom-case-btn">
               <i class="f24 el-icon-document-remove color-4E5969"></i>
               <a class="pl-4 f14">签字</a>
@@ -352,8 +352,7 @@ export default {
       calling: false, // 是否在通话
       isMute: false, //是否静音
       isPause: false, //是否暂停
-
+      updateUnm:1,
-
       callingInfoData: {
         countInit: 0,
         countOk: 0,
@@ -477,6 +476,9 @@ export default {
     }
   },
   methods: {
+    getSetTimeWritCaseList(){
+      this.updateUnm ++;
+    },
     debtorEntityCardNo(datalist, len) {
       let datacardno = ''
       let dataphone = ''

src/pages/mediation-page/components/cassWrit.vue

@@ -94,6 +94,7 @@
 
 <script>
 import caseManagement from "@/services/caseManagement";
+import { number } from "echarts";
 export default {
   components: {
     pdfPreview: () => import('@/components/pdfPreview.vue'),//查看PDF文件
@@ -109,6 +110,12 @@ export default {
         return ''
       },
     },
+    updateUnm: {
+      type: number,
+      default: () => {
+        return 0
+      },
+    },
   },
   data() {
     return{
@@ -127,8 +134,17 @@ export default {
       },
     }
   },
+  watch: {
+    updateUnm: {
+      handler(val) {
+        this.getWritCaseList();
+      },
+      immediate: true,
+      deep: true
+    },
+  },
   async created() {
-    await this.getWritCaseList();
+    // await this.getWritCaseList();
   },
   methods: {
 

src/pages/mediation-page/components/coobligationInfo.vue

@@ -34,10 +34,10 @@
 
             <!-- <div class="descriptions-t-item-r color-86909C" style="width: 80px;">详情 ></div> -->
           </div>
-          <div class="flex-row descriptions-t-item">
+          <!-- <div class="flex-row descriptions-t-item">
             <div class="descriptions-t-item-l color-86909C">案件包名称:</div>
             <div class="descriptions-t-item-r">{{item.casePkg}}</div>
-          </div>
+          </div> -->
           <div class="flex-row descriptions-t-item bgColor-F7F8FA">
             <div class="descriptions-t-item-l color-86909C">金融产品名称:</div>
             <div class="descriptions-t-item-r">{{item.productTypeId}}</div>