Merge branch 'dev'

@@ -119,7 +119,7 @@ export function getSlsqBdcqzList (params) {
 }
 
 /**
- * @description: 证书预览
+ * @description: 证书证明预览
  * @param {*} data
  * @author: renchao
  */

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-30 08:40:36
+ * @LastEditTime: 2023-09-01 08:20:51
 -->
 <template>
   <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
@@ -187,9 +187,9 @@
             setTimeout(() => {
               that.ruleForm.tmpcontent = document.getElementById("S1").value;
               if (that.ruleForm.tmpno == 'zsdy') {
-                LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src='http://192.168.2.38:9000/bdcdj/zhengshu_image/bdcqzs2.jpg'>");
+                LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src=" + window._config.services.management + "':9000/bdcdj/zhengshu_image/bdcqzs2.jpg'>");
               } else if (that.ruleForm.tmpno == 'zmdy') {
-                LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src='http://192.168.2.38:9000/bdcdj/zhengshu_image/bdcdjzm.jpg'>");
+                LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src=" + window._config.services.management + "':9000/bdcdj/zhengshu_image/bdcdjzm.jpg'>");
               }
               LODOP.SET_SHOW_MODE("BKIMG_PRINT", 1);//打印包含背景图	
               that.loadStatus = '2';

@@ -5,7 +5,7 @@
 -->
 <template>
   <div>
-    <ul class="edit-title-list" v-if="djlxList.length > 0">
+    <ul class="edit-title-list" v-if="djlxList.length > 0 ">
       <li v-for="(item, index) in djlxList" @click="handleTitleSelct(item, index)" :key="index"
         :class="{ active: index == tn }">
         {{ item.nodename }}
@@ -190,15 +190,19 @@
        */
       init () {
         this.tn = 0;
-        getDjlxInfo(this.formData.bsmSqyw).then((res) => {
-          let { result } = res;
-          this.djlxList = result ? result : [];
-          if (this.djlxList.length > 0) {
-            this.getDetail(this.djlxList[0].bsmSqyw);
-          } else {
+        if(this.formData.sqfl=="2"){
             this.getDetail(this.formData.bsmSqyw);
-          }
-        })
+        }else{
+            getDjlxInfo(this.formData.bsmSqyw).then((res) => {
+                      let { result } = res;
+                      this.djlxList = result ? result : [];
+                      if (this.djlxList.length > 0) {
+                        this.getDetail(this.djlxList[0].bsmSqyw);
+                      } else {
+                        this.getDetail(this.formData.bsmSqyw);
+                      }
+                    })
+        }        
       },
       /**
        * @description: orderNoChange

@@ -38,6 +38,7 @@
 </template>
 <script>
   import table from "@/utils/mixin/table";
+  import { mapGetters } from 'vuex'
   import { datas, sendThis } from "./xttzdata";
   import { getSysNoticeList, deleteSysNotice, publishNotice, unPublishNotice } from "@/api/sysNotice.js"
   import addDialog from "./components/addDialog.vue";
@@ -73,6 +74,17 @@
         isDiglog: false
       }
     },
+    computed: {
+      ...mapGetters(['isRefresh'])
+    },
+    watch: {
+      isRefresh: {
+        handler (newVal, oldVal) {
+          if (newVal) this.queryClick()
+        },
+        immediate: true
+      }
+    },
     methods: {
       // 列表渲染接口
       /**
@@ -90,7 +102,6 @@
           }
         })
       },
-      //打开新增弹窗
       /**
        * @description: 打开新增弹窗
        * @param {*} item
@@ -102,6 +113,7 @@
         } else {
           this.$popupDialog("新增系统通知", "system/xttz/components/addDialog", { "isButtonFlag": true }, "50%")
         }
+        this.$store.dispatch("user/refreshPage", false);
       },
       //删除
       delNotice (item) {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-31 09:25:12
+ * @LastEditTime: 2023-08-31 09:48:52
 -->
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
@@ -468,7 +468,7 @@
                 })
               } else {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 770, 428 + (23 * (i - 1)) + (index * 14)); // 调整行高
+                  context.fillText(line, 770, 435 + (23 * (i - 1)) + (index * 14)); // 调整行高
                 })
               }
             } else {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-30 16:03:09
+ * @LastEditTime: 2023-09-01 08:21:18
 -->
 <template>
   <div>
@@ -66,13 +66,13 @@
               )
             }
           },
-          // {
-          //   label: '身份证读卡器',
-          //   align: 'center',
-          //   render: (h, scope) => {
-          //     return <el-button type="text" icon="el-icon-tickets" disabled={!this.disabled} onClick={() => { this.readClick(scope.row) }}>读取</el-button>
-          //   }
-          // },
+          {
+            label: '身份证读卡器',
+            align: 'center',
+            render: (h, scope) => {
+              return <el-button type="text" icon="el-icon-tickets" disabled={!this.disabled} onClick={() => { this.readClick(scope.row) }}>读取</el-button>
+            }
+          },
           {
             prop: "sqrmc",
             label: "姓名/名称"

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-30 17:31:53
+ * @LastEditTime: 2023-08-31 09:36:04
 -->
 <template>
   <div class="szxx">
@@ -134,7 +134,7 @@
         store.dispatch('user/reWorkFresh', false)
 
         if (type == 1) {
-          //证书预览
+          //证书证明预览
           this.$popupDialog("证书证明预览", "workflow/components/dialog/zsyl", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true);
         } else {
           this.$popupDialog("证书证明打印", "workflow/components/dialog/zsdy", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true);

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-30 14:13:47
+ * @LastEditTime: 2023-08-31 09:35:49
  */
 import { getPrintTemplateByCode } from "@/api/print";
 import { uploadUndo } from "@/api/clxx";
@@ -122,7 +122,7 @@ export default {
           this.$popupDialog("登记簿详情", "registerBook/djbFrame", this.currentSelectProps, '80%', true)
           break;
         case "B5":
-          this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", {
+          this.$popupDialog("证书证明预览", "workflow/components/dialog/zsyl", {
             bsmSlsq: this.bsmSlsq,
             entryType: '1'
           }, '1210px', true)

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-31 09:24:28
+ * @LastEditTime: 2023-09-01 08:42:43
 -->
 <template>
   <div class="from-clues">
@@ -106,7 +106,8 @@
       openDialog (item) {
         this.$startLoading()
         bdcqzPreview(item).then(res => {
-          this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", {
+          this.$endLoading()
+          this.$popupDialog("证书证明预览", "workflow/components/dialog/zsyl", {
             bsmSlsq: item.bsmSlsq,
             bsmBdcqz: item.bsmBdcqz
           }, '1210px', true)