From c49b95fc3576f9a5dad5bcaa6874157d5091f6e0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Thu, 27 Aug 2020 09:19:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
index be3b38c..f2c679f 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
@@ -45,7 +45,7 @@
                 headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
                 page: true,
                 cols: [[
-                    { field: 'proName',width: "10%",align: 'center', title: '产品名称' },
+                    { field: 'proName',width: "220",align: 'center', title: '产品名称' },
                     {
                         field: 'proType', align: 'center', width: '10%', templet: function (d) {
                             if (d.proType === 0)
@@ -72,12 +72,12 @@
                     { field: 'proPrice', width: '10%', align: 'center', title: '价格' },
                     { field: 'recordCount', width: '10%', align: 'center', title: '报告数' },
                     { field: 'ailightCount', width: '10%', align: 'center', title: '读片量' },
-                    { field: 'enabled', width: '10%', align: 'center', templet: '#product-tpl-state', sort: true, title: '状态' },
                     {
-                        field: 'createTime', width: '10%', align: 'center', sort: true, title: '创建时间', templet: function (d) {
+                        field: 'createTime', width: '120', align: 'center', sort: true, title: '创建时间', templet: function (d) {
                             return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
                         }
                     },
+                    { field: 'enabled', width: '10%', align: 'center', templet: '#product-tpl-state', sort: true, title: '状态' },
                     { align: 'center', width: '10%', toolbar: '#product-table-bar', title: '操作' }
                 ]],
                 done: function (res) {

--
Gitblit v1.8.0