Merge branch 'xy3yuan1015' into test

src/js/dept/qcListCopyDept.js

@@ -382,15 +382,15 @@ $(".abnormalClear").on("click", function (e) {
         data_desc = ["behospitalDate"]
     }
     data_asc = [];
-    if (from == 2 || from == 13) {
+    if (from == 2 ) {
         deptId = deptListDept[0] && deptListDept[0].deptId;
         deptName = deptListDept[0] && deptListDept[0].deptName;
         deptNameTemp = deptListDept[0] && deptListDept[0].deptName;
         deptIdTemp = deptListDept[0] && deptListDept[0].deptId;
         $('.selectDept').html(deptName).append(`<img class="arrow" src=${iconDown} alt="下拉">`);
     }
-    if (from == 4 || from == 9 || from == 8) {
-        deptIdTemp = deptIdPram = deptIdPram
+    if (from == 4 || from == 9 || from == 8 || from == 13) {
+        deptIdTemp = deptIdPram = deptId
         deptName = deptNameTemp = deptNamePram
     }
     // if (docName) {

src/js/login.js

@@ -102,6 +102,7 @@ function getHospitalMark() {
     //点击换一张事件
     $("#codeImg,#changeCode").click(function () {
       getSecurityCode();
+      $(".security-code input").val('')
     })
     $("#password").focus(function () {
       $(this).attr("type", "password")
@@ -175,6 +176,7 @@ function sureLogin() {
     } else {
         if(!is3His){
           getSecurityCode();
+          $(".security-code input").val('')
         }//登录失败切换验证码
       $(".divModal").remove()
       if (type == 1) {