Merge branch 'dev-1.1.1' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.1

src/main/resources/static/js/common/pharmacy-com.js

@@ -338,9 +338,8 @@ function request(config) {
                     window.location.href = '/thmz/login/view';
                     return;
                 }
-                console.log(res);
                 if (res.code == 0) {
-                    resolve(res.data);
+                    resolve(res);
                 } else {
                     new PNotify({
                         title: '错误提示',
@@ -349,7 +348,7 @@ function request(config) {
                         hide: true,
                         styling: 'bootstrap3'
                     });
-                    reject(res.message)
+                    reject(res)
                 }
             },
             error: err => {

src/main/resources/static/js/mz/pharmacy-cell-number.js

@@ -241,10 +241,12 @@ function refeshTable() {
             //删除并返回数组的第一个元素
             let c = tempPastList.shift();
             let name = c.name;
-            if(name.length > 3){
-                $("#past" + i).html((c.lineUp!==10000?'<span style="font-size:32px;"><span class="number-name" style="background: red">&nbsp;'+c.lineUp+'&nbsp;</span>&nbsp;':'')+name+"</span>");
-            }else{
-                $("#past" + i).html((c.lineUp!==10000?'<span class="number-name" style="background: red">&nbsp;'+c.lineUp+'&nbsp;</span>&nbsp;':'')+name);
+            if(name){
+                if(name.length > 3){
+                    $("#past" + i).html((c.lineUp!==10000?'<span style="font-size:32px;"><span class="number-name" style="background: red">&nbsp;'+c.lineUp+'&nbsp;</span>&nbsp;':'')+name+"</span>");
+                }else{
+                    $("#past" + i).html((c.lineUp!==10000?'<span class="number-name" style="background: red">&nbsp;'+c.lineUp+'&nbsp;</span>&nbsp;':'')+name);
+                }
             }
         }
     }

src/main/resources/static/js/mz/pharmacy-cell.js

@@ -41,6 +41,7 @@ $(function () {
                         window.localStorage["lineUpList"] = JSON.stringify(res.data);
                         lineUpList = res.data;
                     } else {
+                        $("#errorText").text(res.message);
                         $("#showErrorModal").modal("show");
                     }
                     $("#showModal").modal("hide");
@@ -70,6 +71,7 @@ $(function () {
                 param: 'qrcode_01302'
             }
         }).then((res)=>{
+            console.log(res.data);
             $.ajax({
                 type: "POST",
                 url: '/thmz/mzLineUp',
@@ -118,8 +120,6 @@ function siReadCard(bizType) {
                 return;
             }
             if (res.code == 200) {
-                var data = JSON.parse(res.data);
-                console.log(data);
                 successMesage(res);
             } else {
                 errorMesage(res);

src/main/resources/static/js/yf/ward_prescription.js

@@ -1204,6 +1204,7 @@ function save(flag) {
                 if (!confirm("是否需要打印当前药单的口服标签？")) {
                     console.log(res.data);
                     if (res.data) {
+                        printLabelData(flag, 1);//口服药单，并使用摆药机
                         request({
                             url: '/savePrescriptionByj',
                             method: 'POST',
@@ -1212,7 +1213,6 @@ function save(flag) {
                             successMesage(res);
                         });
                     }
-                    printLabelData(flag, 1);//口服药单，并使用摆药机
                 } else {
                     printLabelData(flag);
                 }