Merge branch 'dev-1.1.4' into 'dev-1.1.4'

中草药退药优化

See merge request lihong/thmz_system!75

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

@@ -334,7 +334,7 @@ function initTbTable() {
             },
             columns: initColumns(),
             rowStyle: function (row, index) {
-                if (row.pageClass == "T" || row.pageClass == "HT") {
+                if (row.pageClass === "T" || row.pageClass === "HT" || row.statusFlag === "T") {
                     return {css: {'color': 'red', 'padding': '0px'}};
                 }
                 return {css: {'padding': '0px'}};
@@ -1962,6 +1962,9 @@ function cancelSubmit(pageNo, wardName, pageClass) {
  * @param pageNo 药单号
  */
 function cancelZcySubmit(pageNo, wardName, pageClass){
+    if (!confirm("确定要拒绝【" + wardName + "】提交的(" + pageNo + ")退药单吗？")) {
+        return;
+    }
     request({
         url: '/sendZyWard',
         method: 'GET',