From d526d571cbe0a950e777fb325978d72f3ddb302b Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Thu, 13 Aug 2020 21:38:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html
index 1085a63..6c92aa7 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html
@@ -42,14 +42,6 @@
                     { field: 'hospitalName', width: 300, title: '医院名称' },
                     { field: 'departmentName', width: 100, title: '科室名称' },
                     { field: 'proName', width: 250, title: '产品名称' },
-                    {
-                        field: 'proType', sort: true, align: 'center', width: 80, templet: function (d) {
-                            if (d.proType === 0)
-                                return "试用"
-                            else
-                                return "正式"
-                        }, title: '类型'
-                    },
                     { field: 'ailightCount', width: 150, title: '读片量' },
                     { field: 'recordCount', width: 100, title: '报告量' },
                     {
@@ -86,21 +78,25 @@
 
         // 修改状态
         form.on('switch(product-tpl-state)', function (obj) {
-            layer.load(2);
-            admin.req('api-opration/productorderdetail/updateEnabled', {
+            layer.confirm("确定要通过此试用吗?",{btn: ["确定", "返回"]},function(){
+                admin.req('api-opration/productorderdetail/updateEnabled', {
                 id: obj.elem.value,
                 enabled: obj.elem.checked ? true : false
             }, function (data) {
                 layer.closeAll('loading');
                 if (data.code == 0) {
-                    layer.msg(data.msg, { icon: 1, time: 500 });
+                    layer.msg(data.msg, { icon: 1, time: 2000 });
         renderTable();
                 } else {
-                    layer.msg(data.msg, { icon: 2, time: 500 });
+                    layer.msg(data.msg, { icon: 2, time: 2000 });
                     $(obj.elem).prop('checked', !obj.elem.checked);
                     form.render('checkbox');
                 }
             }, 'GET');
+            },function(){
+                $(obj.elem).prop('checked', !obj.elem.checked);
+                    form.render('checkbox');
+            });
         });
         // 搜索按钮点击事件
         $('#product-btn-search').click(function () {

--
Gitblit v1.8.0