From 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 01 Mar 2021 14:14:35 +0800
Subject: [PATCH] Merge branch 'dev1.1' into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html |   37 ++++++++++++++++++++-----------------
 1 files changed, 20 insertions(+), 17 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 35ebbf8..7d953d9 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
@@ -8,7 +8,7 @@
     </div>
     <div class="layui-card-body">
         <div class="layui-form toolbar">&emsp;
-            <input id="product-search-value" class="layui-input search-input" type="text" placeholder="输入产品名" />&emsp;
+            <input id="product-search-value" class="layui-input search-input" type="text" placeholder="按产品名" />&emsp;
             <button id="product-btn-search" class="layui-btn icon-btn"><i class="layui-icon permissions"
                     permissions="product-list">&#xe615;</i>搜索</button>
             <button id="product-btn-add" class="layui-btn icon-btn permissions" permissions="product-edit"><i
@@ -45,9 +45,9 @@
                 headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
                 page: true,
                 cols: [[
-                    { field: 'proName', width: 300, title: '产品名称' },
+                    { field: 'proName',width: "220",align: 'center', title: '产品名称' },
                     {
-                        field: 'proType', align: 'center', width: 100, templet: function (d) {
+                        field: 'proType', align: 'center', width: '10%', templet: function (d) {
                             if (d.proType === 0)
                                 return "试用"
                             else
@@ -55,7 +55,7 @@
                         }, title: '类型'
                     },
                     {
-                        field: 'proTime', width: 150, title: '有效时长', templet: function (d) {
+                        field: 'proTime', width: '10%', align: 'center', title: '有效时长', templet: function (d) {
                             switch (d.proTimeUnit) {
                                 case 0:
                                     return d.proTime + "天";
@@ -69,19 +69,19 @@
                             }
                         }
                     },
-                    { field: 'proPrice', width: 100, title: '价格' },
-                    { field: 'recordCount', width: 180, title: '报告数' },
-                    { field: 'ailightCount', width: 180, title: '读片量' },
-                    { field: 'enabled', width: 150, templet: '#product-tpl-state', sort: true, title: '状态' },
+                    { field: 'proPrice', width: '10%', align: 'center', title: '价格' },
+                    { field: 'recordCount', width: '10%', align: 'center', title: '报告数' },
+                    { field: 'ailightCount', width: '10%', align: 'center', title: '读片量' },
                     {
-                        field: 'createTime', width: 200, sort: true, title: '创建时间', templet: function (d) {
-                            return new Date(d.createTime).dateFormat("yyyy-MM-dd HH:mm");
+                        field: 'createTime', width: '120', align: 'center', sort: true, title: '创建时间', templet: function (d) {
+                            return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
                         }
                     },
-                    { align: 'center', width: 100, toolbar: '#product-table-bar', title: '操作' }
+                    { field: 'enabled', width: '10%', align: 'center', templet: '#product-tpl-state', sort: true, title: '状态' },
+                    { align: 'center', width: '10%', toolbar: '#product-table-bar', title: '操作' }
                 ]],
-                done: function () {
-                    permissionsInput();
+                done: function (res) {
+                    permissionsInput(res,config);
                 }
             });
         }
@@ -96,9 +96,9 @@
             }, 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 });
                 } 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');
                 }
@@ -113,7 +113,7 @@
                     layer.load(2);
                     admin.req('api-opration/product/' + obj.data.id, {}, function (data) {
                         layer.closeAll('loading');
-                        layer.msg(data.msg, { icon: 1, time: 500 }, function () {
+                        layer.msg(data.msg, { icon: 1, time: 2000 }, function () {
 
                             renderTable();
                         });
@@ -126,7 +126,10 @@
         // 搜索按钮点击事件
         $('#product-btn-search').click(function () {
             var proName = $('#product-search-value').val();
-            table.reload('product-table', { where: { proName: proName } });
+            table.reload('product-table', { where: { proName: proName},
+                page: {
+                    curr: 1 
+                } });
         });
         // 添加按钮点击事件
         $('#product-btn-add').click(function () {

--
Gitblit v1.8.0