浏览代码

取消修改支付方式

hurugang 4 年之前
父节点
当前提交
fe1502a8dd
共有 2 个文件被更改,包括 35 次插入29 次删除
  1. 33 27
      src/main/resources/static/js/registration_list.js
  2. 2 2
      src/main/resources/static/js/toll_administration.js

+ 33 - 27
src/main/resources/static/js/registration_list.js

@@ -1571,7 +1571,7 @@ function loadCardList() {
                     html += '</div><div class="el-row" title="' + mzyReqrecVo.mzPatientMi.phoneNo + '">' + sex + ' / ' + mzyReqrecVo.mzPatientMi.age + '岁 / ' + mzyReqrecVo.mzPatientMi.phoneNo + '</div><div class="el-row" title="' + mzyReqrecVo.mzyReqrec.ampm + '">' + mzyReqrecVo.mzyReqrec.ampm + ' / ' + mzyReqrecVo.mzyReqrec.chargeType + '</div><div class="el-row" title="' + mzyReqrecVo.mzyReqrec.chargeType + '">' + mzyReqrecVo.mzyReqrec.unitCode + ' / ' + mzyReqrecVo.mzyReqrec.doctorCode + '</div><div class="el-row">' + format(mzyReqrecVo.mzyReqrec.requestDay, "yyyy-MM-dd HH:mm:ss") + '</div></div></div>';
                     if (mzyReqrecVo.mzyReqrec.cancelMark == 1) {
                         html += '<div class="patient-card-foot">' +
-                            '                        <div class="col-md-2 col-sm-2 col-xs-12">' +
+                            '                        <div class="col-md-3 col-sm-3 col-xs-12">' +
                             '                            <button type="button" class="can-not-used"' +
                             '                                    title="修改挂号">' +
                             '                                <i class="fa fa-edit"></i>' +
@@ -1583,19 +1583,19 @@ function loadCardList() {
                             '                                <i class="fa fa-user"></i>' +
                             '                            </button>' +
                             '                        </div>' +
-                            '                        <div class="col-md-2 col-sm-2 col-xs-12">' +
-                            '                            <button type="button" class="registration-no-color-foot-button"' +
-                            '                                    title="修改收款方式" onclick="editPayMode(\'' + mzyReqrecVo.mzyReqrec.patientId + '\','+mzyReqrecVo.mzyReqrec.times+',\''+mzyReqrecVo.mzyReqrec.paymode+'\','+mzyReqrecVo.mzyReqrec.dcountNo+')">' +
-                            '                                <i class="fa fa-credit-card"></i>' +
-                            '                            </button>' +
-                            '                        </div>' +
+                            // '                        <div class="col-md-2 col-sm-2 col-xs-12">' +
+                            // '                            <button type="button" class="registration-no-color-foot-button"' +
+                            // '                                    title="修改收款方式" onclick="editPayMode(\'' + mzyReqrecVo.mzyReqrec.patientId + '\','+mzyReqrecVo.mzyReqrec.times+',\''+mzyReqrecVo.mzyReqrec.paymode+'\','+mzyReqrecVo.mzyReqrec.dcountNo+')">' +
+                            // '                                <i class="fa fa-credit-card"></i>' +
+                            // '                            </button>' +
+                            // '                        </div>' +
                             '                        <div class="col-md-3 col-sm-3 col-xs-12">' +
                             '                            <button type="button" class="can-not-used"' +
                             '                                    title="退号">' +
                             '                                <i class="fa fa-minus-square-o"></i>' +
                             '                            </button>' +
                             '                        </div>' +
-                            '                        <div class="col-md-2 col-sm-2 col-xs-12">' +
+                            '                        <div class="col-md-3 col-sm-3 col-xs-12">' +
                             '                            <button type="button" class="can-not-used"' +
                             '                                    title="打印">' +
                             '                                <i class="fa fa-print"></i>' +
@@ -1605,7 +1605,7 @@ function loadCardList() {
                     }
                     if (mzyReqrecVo.mzyReqrec.visitedMark == 1) {
                         html += '<div class="patient-card-foot">' +
-                            '                        <div class="col-md-2 col-sm-2 col-xs-12">' +
+                            '                        <div class="col-md-3 col-sm-3 col-xs-12">' +
                             '                            <button type="button" class="can-not-used"' +
                             '                                    title="修改挂号">' +
                             '                                <i class="fa fa-edit"></i>' +
@@ -1617,19 +1617,19 @@ function loadCardList() {
                             '                                <i class="fa fa-user"></i>' +
                             '                            </button>' +
                             '                        </div>' +
-                            '                        <div class="col-md-2 col-sm-2 col-xs-12">' +
-                            '                            <button type="button" class="registration-no-color-foot-button"' +
-                            '                                    title="修改收款方式" onclick="editPayMode(\'' + mzyReqrecVo.mzyReqrec.patientId + '\','+mzyReqrecVo.mzyReqrec.times+',\''+mzyReqrecVo.mzyReqrec.paymode+'\','+mzyReqrecVo.mzyReqrec.dcountNo+')">' +
-                            '                                <i class="fa fa-credit-card"></i>' +
-                            '                            </button>' +
-                            '                        </div>' +
+                            // '                        <div class="col-md-2 col-sm-2 col-xs-12">' +
+                            // '                            <button type="button" class="registration-no-color-foot-button"' +
+                            // '                                    title="修改收款方式" onclick="editPayMode(\'' + mzyReqrecVo.mzyReqrec.patientId + '\','+mzyReqrecVo.mzyReqrec.times+',\''+mzyReqrecVo.mzyReqrec.paymode+'\','+mzyReqrecVo.mzyReqrec.dcountNo+')">' +
+                            // '                                <i class="fa fa-credit-card"></i>' +
+                            // '                            </button>' +
+                            // '                        </div>' +
                             '                        <div class="col-md-3 col-sm-3 col-xs-12">' +
                             '                            <button type="button" class="can-not-used"' +
                             '                                    title="退号">' +
                             '                                <i class="fa fa-minus-square-o"></i>' +
                             '                            </button>' +
                             '                        </div>' +
-                            '                        <div class="col-md-2 col-sm-2 col-xs-12">';
+                            '                        <div class="col-md-3 col-sm-3 col-xs-12">';
                         if (mzyReqrecVo.mzyReqrec.paymode == "本院记账") {
                             html += '                            <button type="button" class="registration-no-color-foot-button"  title="退记账重收" onclick="chargeFeeForByjz(\'' + mzyReqrecVo.mzyReqrec.serialNo + '\')">';
                             html += '                                <i class="fa fa-rmb"></i>';
@@ -1647,7 +1647,7 @@ function loadCardList() {
                             '                    </div>';
                     } else {
                         html += '<div class="patient-card-foot">' +
-                            '                        <div class="col-md-2 col-sm-2 col-xs-12">' +
+                            '                        <div class="col-md-3 col-sm-3 col-xs-12">' +
                             '                            <button type="button" class="can-not-used"' +
                             '                                    title="修改挂号">' +
                             '                                <i class="fa fa-edit"></i>' +
@@ -1659,19 +1659,19 @@ function loadCardList() {
                             '                                <i class="fa fa-user"></i>' +
                             '                            </button>' +
                             '                        </div>' +
-                            '                        <div class="col-md-2 col-sm-2 col-xs-12">' +
-                            '                            <button type="button" class="registration-no-color-foot-button"' +
-                            '                                    title="修改收款方式" onclick="editPayMode(\'' + mzyReqrecVo.mzyReqrec.patientId + '\','+mzyReqrecVo.mzyReqrec.times+',\''+mzyReqrecVo.mzyReqrec.paymode+'\','+mzyReqrecVo.mzyReqrec.dcountNo+')">' +
-                            '                                <i class="fa fa-credit-card"></i>' +
-                            '                            </button>' +
-                            '                        </div>' +
+                            // '                        <div class="col-md-2 col-sm-2 col-xs-12">' +
+                            // '                            <button type="button" class="registration-no-color-foot-button"' +
+                            // '                                    title="修改收款方式" onclick="editPayMode(\'' + mzyReqrecVo.mzyReqrec.patientId + '\','+mzyReqrecVo.mzyReqrec.times+',\''+mzyReqrecVo.mzyReqrec.paymode+'\','+mzyReqrecVo.mzyReqrec.dcountNo+')">' +
+                            // '                                <i class="fa fa-credit-card"></i>' +
+                            // '                            </button>' +
+                            // '                        </div>' +
                             '                        <div class="col-md-3 col-sm-3 col-xs-12">' +
                             '                            <button type="button" class="registration-no-color-foot-button"' +
                             '                                    title="退号" onclick="backNoModal(\'' + mzyReqrecVo.mzyReqrec.patientId + '\',' + mzyReqrecVo.mzyReqrec.times + ')">' +
                             '                                <i class="fa fa-minus-square-o"></i>' +
                             '                            </button>' +
                             '                        </div>' +
-                            '                        <div class="col-md-2 col-sm-2 col-xs-12">';
+                            '                        <div class="col-md-3 col-sm-3 col-xs-12">';
                         if (mzyReqrecVo.mzyReqrec.paymode == "本院记账") {
                             html += '                            <button type="button" class="registration-no-color-foot-button"  title="退记账重收" onclick="chargeFeeForByjz(\'' + mzyReqrecVo.mzyReqrec.serialNo + '\')">';
                             html += '                                <i class="fa fa-rmb"></i>';
@@ -1847,10 +1847,14 @@ function loadTableList() {
                     // sortable: true,
                     formatter: function (value, row, index) {
                         if (row.mzyReqrec.cancelMark == 1) {
-                            return '<button type="button" class="can-not-used" title="修改挂号"><i class="fa fa-edit"></i></button><button type="button" class="registration-no-color-foot-button"title="修改患者" onclick="editUserModal(\'' + row.mzyReqrec.patientId + '\')"><i class="fa fa-user"></i></button><button type="button" class="registration-no-color-foot-button" title="修改收款方式" onclick="editPayMode(\'' + row.mzyReqrec.patientId + '\','+row.mzyReqrec.times+',\''+row.mzyReqrec.paymode+'\','+row.mzyReqrec.dcountNo+')"><i class="fa fa-credit-card"></i></button><button type="button" class="can-not-used" title="退号"><i class="fa fa-minus-square-o"></i></button><button type="button" class="can-not-used" title="打印" ><i class="fa fa-print"></i></button>';
+                            return '<button type="button" class="can-not-used" title="修改挂号"><i class="fa fa-edit"></i></button><button type="button" class="registration-no-color-foot-button"title="修改患者" onclick="editUserModal(\'' + row.mzyReqrec.patientId + '\')"><i class="fa fa-user"></i></button>' +
+                         //       '<button type="button" class="registration-no-color-foot-button" title="修改收款方式" onclick="editPayMode(\'' + row.mzyReqrec.patientId + '\','+row.mzyReqrec.times+',\''+row.mzyReqrec.paymode+'\','+row.mzyReqrec.dcountNo+')"><i class="fa fa-credit-card"></i></button>' +
+                                '<button type="button" class="can-not-used" title="退号"><i class="fa fa-minus-square-o"></i></button><button type="button" class="can-not-used" title="打印" ><i class="fa fa-print"></i></button>';
                         }
                         if (row.mzyReqrec.visitedMark == 1) {
-                            var html = '<button type="button" class="can-not-used" title="修改挂号"><i class="fa fa-edit"></i></button><button type="button" class="registration-no-color-foot-button"title="修改患者" onclick="editUserModal(\'' + row.mzyReqrec.patientId + '\')"><i class="fa fa-user"></i></button><button type="button" class="registration-no-color-foot-button" title="修改收款方式" onclick="editPayMode(\'' + row.mzyReqrec.patientId + '\',\''+row.mzyReqrec.times+','+row.mzyReqrec.paymode+'\','+row.mzyReqrec.dcountNo+')"><i class="fa fa-credit-card"></i></button><button type="button" class="can-not-used" title="退号"><i class="fa fa-minus-square-o"></i></button>';
+                            var html = '<button type="button" class="can-not-used" title="修改挂号"><i class="fa fa-edit"></i></button><button type="button" class="registration-no-color-foot-button"title="修改患者" onclick="editUserModal(\'' + row.mzyReqrec.patientId + '\')"><i class="fa fa-user"></i></button>' +
+                               // '<button type="button" class="registration-no-color-foot-button" title="修改收款方式" onclick="editPayMode(\'' + row.mzyReqrec.patientId + '\',\''+row.mzyReqrec.times+','+row.mzyReqrec.paymode+'\','+row.mzyReqrec.dcountNo+')"><i class="fa fa-credit-card"></i></button>' +
+                                '<button type="button" class="can-not-used" title="退号"><i class="fa fa-minus-square-o"></i></button>';
                             if (row.mzyReqrec.paymode == "本院记账") {
                                 html += '                            <button type="button" class="registration-no-color-foot-button"  title="退记账重收" onclick="chargeFeeForByjz(\'' + row.mzyReqrec.serialNo + '\')">';
                                 html += '<i class="fa fa-rmb"></i></button>';
@@ -1866,7 +1870,9 @@ function loadTableList() {
                             return html;
 
                         }
-                        var html = '<button type="button" class="can-not-used" title="修改挂号"><i class="fa fa-edit"></i></button><button type="button" class="registration-no-color-foot-button"title="修改患者" onclick="editUserModal(\'' + row.mzyReqrec.patientId + '\')"><i class="fa fa-user"></i></button><button type="button" class="registration-no-color-foot-button" title="修改收款方式" onclick="editPayMode(\'' + row.mzyReqrec.patientId + '\','+row.mzyReqrec.times+',\''+row.mzyReqrec.paymode+'\','+row.mzyReqrec.dcountNo+')"><i class="fa fa-credit-card"></i></button><button type="button" class="registration-no-color-foot-button" title="退号" onclick="backNoModal(\'' + row.mzyReqrec.patientId + '\',' + row.mzyReqrec.times + ')"><i class="fa fa-minus-square-o"></i></button>';
+                        var html = '<button type="button" class="can-not-used" title="修改挂号"><i class="fa fa-edit"></i></button><button type="button" class="registration-no-color-foot-button"title="修改患者" onclick="editUserModal(\'' + row.mzyReqrec.patientId + '\')"><i class="fa fa-user"></i></button>' +
+                           // '<button type="button" class="registration-no-color-foot-button" title="修改收款方式" onclick="editPayMode(\'' + row.mzyReqrec.patientId + '\','+row.mzyReqrec.times+',\''+row.mzyReqrec.paymode+'\','+row.mzyReqrec.dcountNo+')"><i class="fa fa-credit-card"></i></button>' +
+                            '<button type="button" class="registration-no-color-foot-button" title="退号" onclick="backNoModal(\'' + row.mzyReqrec.patientId + '\',' + row.mzyReqrec.times + ')"><i class="fa fa-minus-square-o"></i></button>';
                         if (row.mzyReqrec.paymode == "本院记账") {
                             html += '                            <button type="button" class="registration-no-color-foot-button"  title="退记账重收" onclick="chargeFeeForByjz(\'' + row.mzyReqrec.serialNo + '\')">';
                             html += '<i class="fa fa-rmb"></i></button>';

+ 2 - 2
src/main/resources/static/js/toll_administration.js

@@ -364,7 +364,7 @@ function initFeeTable() {
                         return str;
                     }
                     if (payMarkGroup == 1) {
-                        str += '<button type="button" class="registration-no-color-foot-button" title="修改收款方式" onclick="showChequType(\'' + row.patientId + '\','+row.times+','+row.receiptNo+')"><i class="fa fa-credit-card"></i></button>' ;
+                       // str += '<button type="button" class="registration-no-color-foot-button" title="修改收款方式" onclick="showChequType(\'' + row.patientId + '\','+row.times+','+row.receiptNo+')"><i class="fa fa-credit-card"></i></button>' ;
                         str += '<button type="button" class="registration-no-color-foot-button" title="退费" onclick="refundFee(\'' + row.patientId + '\',' + row.times + ',' + row.receiptNo + ',' + row.printFlag + ');"><i class="fa fa-reply"></i></button>';
                         if (row.printFlag == 0) {
                             str += '<button type="button" id="button_' + row.realNo + '" class="registration-no-color-foot-button" title="发票打印" onclick="prn1PrintHand(\'' + row.patientId + '\',' + row.times + ',true,' + row.receiptNo + ',' + row.realNo + ');" style="color: #35D082;"><i class="fa fa-print"></i></button>';
@@ -375,7 +375,7 @@ function initFeeTable() {
                         return str;
                     }
                     if (payMarkGroup == 2) {
-                        str += '<button type="button" class="registration-no-color-foot-button" title="修改收款方式" onclick="showChequType(\'' + row.patientId + '\','+row.times+','+row.receiptNo+')"><i class="fa fa-credit-card"></i></button>' ;
+                       // str += '<button type="button" class="registration-no-color-foot-button" title="修改收款方式" onclick="showChequType(\'' + row.patientId + '\','+row.times+','+row.receiptNo+')"><i class="fa fa-credit-card"></i></button>' ;
                         return str;
                     }
                 }