Merge branch 'messagePass220412' into test

src/js/appealExamine.js

@@ -195,25 +195,63 @@ $(document).on("click", ".btn-sure", (e) => {
     $("#delModal .modal-body").html("");
     $("#delModal .modal-header .title").html('审核');
     $("#delModal").show();
+
     if (appealOperationType == 0) {
+        var clicktag = 0
         $("#appealDel").tmpl(appealExamineRecordDTOList).appendTo("#delModal .modal-body");
         $("#delModal .confirm").text("确定").unbind("click").click(function () {
-            approved(1)
+            if (clicktag == 0) {
+                clicktag = 1;
+                approved(1)
+                // 此处可以添加其他逻辑
+                // 3秒后按钮可正常点击
+                setTimeout(function () {
+                    clicktag = 0
+                }, 3000);
+            }
+
         });
     } else if (appealOperationType == 1) {
+        var clicktag = 0
         $("#appealAdd").tmpl(appealExamineRecordDTOList).appendTo("#delModal .modal-body");
         $("#delModal .confirm").text("确定").unbind("click").click(function () {
-            approved(2)
+            if (clicktag == 0) {
+                clicktag = 1;
+                approved(2)
+                // 此处可以添加其他逻辑
+                // 3秒后按钮可正常点击
+                setTimeout(function () {
+                    clicktag = 0
+                }, 3000);
+            }
         });
     } else if (appealOperationType == 2) {
+        var clicktag = 0
         $("#appealDef").tmpl(appealExamineRecordDTOList).appendTo("#delModal .modal-body");
         $("#delModal .confirm").text("确定").unbind("click").click(function () {
-            approved(3)
+            if (clicktag == 0) {
+                clicktag = 1;
+                approved(3)
+                // 此处可以添加其他逻辑
+                // 3秒后按钮可正常点击
+                setTimeout(function () {
+                    clicktag = 0
+                }, 3000);
+            }
         });
     } else if (appealOperationType == 3) {
+        var clicktag = 0
         $("#appealRec").tmpl(appealExamineRecordDTOList).appendTo("#delModal .modal-body");
         $("#delModal .confirm").text("确定").unbind("click").click(function () {
-            approved(4)
+            if (clicktag == 0) {
+                clicktag = 1;
+                approved(4)
+                // 此处可以添加其他逻辑
+                // 3秒后按钮可正常点击
+                setTimeout(function () {
+                    clicktag = 0
+                }, 3000);
+            }
         });
     }
 });
@@ -242,7 +280,6 @@ $(document).on("click", ".btn-cancel", (e) => {
 });
 //审核
 function approved(type) {
-    console.log(type);
     if (type == 1) {
         appealInfo.exampleOperation = $('input:radio:checked').val()
         if ($('input:radio:checked').val() == 2) {
@@ -282,7 +319,7 @@ function approved(type) {
             $(".appealAdd .warning").show();
             return
         }
-        
+
     } else if (type == 3) {
         appealInfo.exampleOperation = 4
         appealInfo.processResult = $(".textarea").val().trim()

src/js/appealUserPage.js

@@ -46,6 +46,7 @@ $(function () {
     showModal('2');
   });
   $("body").on("click", ".refreshBtn", function () {
+    $("#contentInfo").html('')
     getRecordDetailUpdate2();
   });
   function showAppealDetailEvent() {
@@ -185,7 +186,7 @@ $(function () {
         }
         $(".operation").show()
         initPatientInfo(info);
-        initContent(result.pageData);
+        initContent(result.pageData,2);
         initList(msg);
         initScoreItem(msg);
         global_flawData = msg;
@@ -227,7 +228,7 @@ $(function () {
         // $(".subMenu >li:first-child.page,.menu-mini>ul>li:first-child.page").addClass("active");
         // global_activeTab=$(".sub-menu .page.active").attr("code");
         // initPatientInfo(info);
-        // initContent(result.pageData);
+        initContent(result.pageData,1);
         initScoreItem(msg);
         global_flawData = msg;
         global_flawDataPay = drgs;

src/js/qcScore.js

@@ -45,7 +45,12 @@ $(function () {
     });
   }
   $("body").on("click", ".refreshBtn", function () {
-    getRecordDetailUpdate2();
+    // $(".flaw-box").html('')
+    // $(".patient-info").html('')
+    // $("#subMenu").html('')
+    $("#contentInfo").html('')
+    // console.log(global_activeTab);
+    getRecordDetailUpdate2()
   });
   function showAppealDetailEvent() {
     //申诉状态点击事件
@@ -104,7 +109,7 @@ $(function () {
           $(".check").css('display', 'block').text(global_check == 1 ? '重新核查' : '病历核查')
         }
       }
-      if (title === "缺陷总览" || title === "谈话告知书" || title === "知情同意书" || title === '医嘱信息' || title === '检验信息' || title === '检查信息' || title === '护理信息'  || title === '其他信息') {
+      if (title === "缺陷总览" || title === "谈话告知书" || title === "知情同意书" || title === '医嘱信息' || title === '检验信息' || title === '检查信息' || title === '护理信息' || title === '其他信息') {
         if (title === "缺陷总览") {
           getRecordDetailUpdate()
         }
@@ -179,7 +184,7 @@ $(function () {
     return false;
   }
   //获取病例明细
-  function getRecordDetail() {
+  function getRecordDetail(type) {
     post(api.getRecordDetail, { 'behospitalCode': global_id }).then(function (res) {
       if (res.data.code === '0') {
         const data = res.data.data;
@@ -195,13 +200,14 @@ $(function () {
         global_activeTab = $(".sub-menu .page.active").attr("code");
         $(".operation").show()
         initPatientInfo(info);
-        initContent(result.pageData);
+        initContent(result.pageData,2);
         initList(msg);
         initScoreItem(msg);
         global_flawData = msg;
         global_flawDataPay = drgs;
         setBoxHeight();
         changePay()
+        
       }
     });
   }
@@ -237,7 +243,7 @@ $(function () {
         // $(".subMenu >li:first-child.page,.menu-mini>ul>li:first-child.page").addClass("active");
         // global_activeTab=$(".sub-menu .page.active").attr("code");
         // initPatientInfo(info);
-        // initContent(result.pageData);
+        initContent(result.pageData,1);
         initScoreItem(msg);
         global_flawData = msg;
         global_flawDataPay = drgs;
@@ -269,12 +275,15 @@ $(function () {
     })
   }
   //显示病例模块明细
-  function initContent(data) {
+  function initContent(data,type) {
     const obj = JSON.parse(data);
     let info = [];
     let hml = '', moduleId = '';
-    formatSpecPage(obj["谈话告知书"], "谈话告知书");
-    formatSpecPage(obj["知情同意书"], "知情同意书");
+    if(type == 2){
+      formatSpecPage(obj["谈话告知书"], "谈话告知书");
+      formatSpecPage(obj["知情同意书"], "知情同意书");
+    }
+    
     // formatSpecPage(obj["医嘱信息"],"医嘱信息");
     $(".content-box").show();
     for (let k in obj) {