From fc223b26f87f7a221b38084bb62d8047974bbf1c Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sun, 26 Apr 2020 12:42:21 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html |   35 +++++++++++------------------------
 1 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
index 268629e..ed14d56 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
@@ -44,10 +44,18 @@
                 cols: [[
                     { field: 'hospitalName', width: 300, title: '医院名称' },
                     { field: 'departmentName', width: 100, title: '科室名称' },
-                    { field: 'proName', width: 200, title: '产品名称' },
-                    { field: 'ailightCount', width: 150, 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: 100, title: '读片量' },
                     { field: 'recordCount', width: 100, title: '报告量' },
-                    { field: 'isShare', width: 150, title: '是否共享',templet:function(d)
+                    { field: 'isShare', width: 100, title: '是否共享',templet:function(d)
                     {
                         if(d.isShare)
                         return '共享'
@@ -64,31 +72,11 @@
                     { field: 'createTime', width: 160, sort: true, title: '创建时间',templet:function(d){
                         return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm:ss");
                     } },
-                    { field: 'enabled', width: 100, templet: '#product-tpl-state', sort: true, title: '状态' },
                     { align: 'center', width: 100, toolbar: '#product-table-bar', title: '操作' }
                 ]]
             });
         }
         renderTable();
-
-        // 修改状态
-        form.on('switch(product-tpl-state)', function (obj) {
-            layer.load(2);
-            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 });
-                } else {
-                    layer.msg(data.msg, { icon: 2, time: 500 });
-                    $(obj.elem).prop('checked', !obj.elem.checked);
-                    form.render('checkbox');
-                }
-            }, 'GET');
-        });
-
         // 工具条点击事件
         table.on('tool(product-table)', function (obj) {
             if (obj.event === 'del') { // 删除
@@ -98,7 +86,6 @@
                     admin.req('api-opration/productorderdetail/' + obj.data.id, {}, function (data) {
                         layer.closeAll('loading');
                         layer.msg(data.msg, { icon: 1, time: 500 }, function () {
-
                             renderTable();
                         });
                         obj.del();

--
Gitblit v1.8.0