luolei před 4 roky
rodič
revize
b36bbe1921

+ 0 - 3
src/css/common.less

@@ -242,6 +242,3 @@ input:-ms-input-placeholder, textarea:-ms-input-placeholder {
     }
 }
 
-.toggle-item {
-    margin-bottom: 10px !important;
-}

+ 6 - 1
src/css/index.less

@@ -1036,10 +1036,15 @@
   }
 
   .midifyEditDel{
+    background-color: #fff !important;
+    color: #FF4D4F !important;
+    border: 1px solid #FF4D4F !important;
+    margin-right: 15px;
+  }
+  .midifyEditQuite{
     color: #fff !important;
     border: 1px solid #00A1FF !important;
     background-color: #00A1FF !important;
-    margin-right: 15px;
   }
   .delTips {
     text-align: center;

+ 1 - 1
src/css/qcList.less

@@ -142,7 +142,7 @@ h2{
     float: left;
     height: 40px;
     line-height: 40px;
-    margin: 0 20px 10px 0;
+    margin: 0 20px 20px 0;
     span{
         display: inline-block;
         line-height: 32px;

+ 1 - 0
src/css/qcListCopy.less

@@ -30,6 +30,7 @@ h2{
     min-height: calc(100% - 84px);
     // overflow: auto;
     height:  calc(100% - 44px);
+    padding-top: 30px;
     .selectDefect{
         min-width: 120px;
         width: auto;

+ 1 - 1
src/css/qcListDept.less

@@ -135,7 +135,7 @@ h2{
     float: left;
     height: 40px;
     line-height: 40px;
-    margin: 0 20px 10px 0;
+    margin: 0 20px 20px 0;
     span{
         display: inline-block;
         line-height: 32px;

+ 1 - 1
src/css/qcListDocteam.less

@@ -133,7 +133,7 @@ h2{
     float: left;
     height: 40px;
     line-height: 40px;
-    margin: 0 20px 10px 0;
+    margin: 0 20px 20px 0;
     span{
         display: inline-block;
         line-height: 32px;

+ 1 - 1
src/css/qcListOutHospital.less

@@ -156,7 +156,7 @@ h2{
     float: left;
     height: 40px;
     line-height: 40px;
-    margin: 0 20px 10px 0;
+    margin: 0 20px 20px 0;
     span{
         display: inline-block;
         line-height: 32px;

+ 1 - 1
src/css/qcListPerson.less

@@ -138,7 +138,7 @@ h2{
     float: left;
     height: 40px;
     line-height: 40px;
-    margin: 0 20px 10px 0;
+    margin: 0 20px 20px 0;
     span{
         display: inline-block;
         line-height: 32px;

+ 4 - 3
src/js/abnormal.js

@@ -256,7 +256,8 @@ function midifyMsgBox(item,type,mol,des,str,name,id){
                 <p class="midifyMsgTitle">删除记录<img class="iconClose" src=${require('./../images/icon_close_default.png')} alt="关闭" /></p>
                 <p class="delTips">确认要删除该条异常记录?</p>
                 <div class="midifyMsgBtn midifyMsgBtnDel">
-                    <span class="midifyEdit midifyEditDel">确定</span>
+                    <span class="midifyEdit midifyEditDel">删除</span>
+                    <span class="midifyEdit midifyEditQuite">取消</span>
                 </div>
             </div>
         </div>`
@@ -265,7 +266,7 @@ function midifyMsgBox(item,type,mol,des,str,name,id){
     $(".midifyEditDel", parent.document).on("click",function(){
         delModifyOne(itemCopy)
     })
-    $(".midifyEditQuit", parent.document).on("click",function(){
+    $(".midifyEditQuite", parent.document).on("click",function(){
         $("#mainBox .midifyMsgBox", parent.document).remove()
     })
     $(".abnormalAll", parent.document).on("click",function(){
@@ -311,7 +312,7 @@ function delModifyOne(itemCopy){
             const data = res.data.data;
             getTabData(1)
             $("#mainBox .midifyMsgBox", parent.document).remove()
-            $.alerModal({"message":'删除成功',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+            $.alerModal({"message":'删除成功',type:"tip",time:'1000',win:true,isFather: true, fatherWrapper: $("#mainBox", parent.document)});
         }else{
             
         }

+ 7 - 4
src/js/assertType.js

@@ -275,7 +275,8 @@ function midifyMsgBox(item,type){
                 <p class="midifyMsgTitle">删除提示 <img class="iconClose" src=${require('./../images/icon_close_default.png')} alt="关闭" /></p>
                 <p class="delTips">确认要删除该条质控类型?</p>
                 <div class="midifyMsgBtn midifyMsgBtnDel">
-                    <span class="midifyEdit midifyEditDel">确定</span>
+                    <span class="midifyEdit midifyEditDel">删除</span>
+                    <span class="midifyEdit midifyEditQuite">取消</span>
                 </div>
             </div>
         </div>`
@@ -284,10 +285,12 @@ function midifyMsgBox(item,type){
     $(".midifyEditDel", parent.document).on("click",function(){
         let ids = []
         ids.push(itemCopy.id)
-        console.log(ids)
         delModifyOne(ids)
     })
-    $(".midifyEditQuit", parent.document).on("click",function(){
+    $(".midifyEditDel", parent.document).on("click",function(){
+        $("#mainBox .midifyMsgBox", parent.document).remove()
+    })
+    $(".midifyEditQuite", parent.document).on("click",function(){
         $("#mainBox .midifyMsgBox", parent.document).remove()
     })
     $(".abnormalAll", parent.document).on("click",function(){
@@ -323,7 +326,7 @@ function delModifyOne(ids){
             const data = res.data.data;
             getTabData(1)
             $("#mainBox .midifyMsgBox", parent.document).remove()
-            $.alerModal({"message":'删除成功',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+            $.alerModal({"message":'删除成功',type:"tip",time:'1000',win:true,isFather: true, fatherWrapper: $("#mainBox", parent.document)});
         }else{
             
         }