'commit'

WebRoot/component/pear/module/tag.js

@@ -8,7 +8,7 @@ layui.define('jquery', function(exports){
   INPUT_NEW_TAG ='input-new-tag',
   TAG_ITEM ='tag-item',
   CLOSE = 'tag-close',
-  DEFAULT_SKIN ='layui-btn layui-btn-primary layui-btn-sm'
+  DEFAULT_SKIN ='layui-btn tag-item-normal layui-btn-primary layui-btn-sm'
   ,tag = function(){
     this.config = {
       skin: DEFAULT_SKIN,

WebRoot/view/tb/org/publish.html

@@ -30,7 +30,8 @@
                     <label class="layui-form-label" style="width: 100px !important;"><span
                             class="require-star"></span>填报截止日期：</label>
                     <div class="layui-input-block" style="margin-left: 90px !important;">
-                        <input type="text" class="layui-input input-width" lay-verify="required" name="deadline_time" id="endDate" placeholder="请选择截止日期">
+                        <input type="text" class="layui-input input-width" lay-verify="required" name="deadline_time"
+                            id="endDate" placeholder="请选择截止日期">
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -48,34 +49,50 @@
                                     <input type="checkbox" id="szjf" lay-skin="tag" title="市直教辅单位">
                                     <input type="checkbox" id="xqjyj" lay-skin="tag" title="县区教育局">
                                 </div>
-                                <div class="layui-tab-item">内容-2</div>
+                                <div class="layui-tab-item">
+                                    <div class="layui-btn-container tag" lay-filter="orgs" lay-allowclose="true"
+                                        style="border-style:dashed;border-width:1px;border-color: #CCCCCC;height: 100px;width: 445px;padding: 10px;overflow: auto;">
+                                    </div>
+                                    <div>
+                                       
+                                        <table id="data-table"></table>
+                                        
+                                    </div>
+
+
+                                    <input type="button" id="test" value="aaaaa" />
+
+
+
+
+                                </div>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
+
         <div class="bottom">
             <div class="button-container">
                 <button type="submit" class="pear-btn pear-btn-primary pear-btn-sm" lay-submit="" lay-filter="publish">
                     <i class="layui-icon layui-icon-ok"></i>
                     提交
                 </button>
-                <button type="reset" class="pear-btn pear-btn-sm">
-                    <i class="layui-icon layui-icon-refresh"></i>
-                    重置
-                </button>
+
             </div>
         </div>
     </form>
     <script src="../../../component/layui/layui.js"></script>
     <script src="../../../component/pear/pear.js"></script>
     <script>
-        layui.use(function () {
+        layui.use(['tag'], function () {
             var form = layui.form;
             var $ = layui.jquery;
             var laydate = layui.laydate;
             var tab = layui.tab;
+            var util = layui.util;
+            var tag = layui.tag;
 
             var bureauIds = "";
 
@@ -85,6 +102,10 @@
                 elem: '#endDate'
             });
 
+            $("#test").click(function () {
+                tag.add('orgs', { text: '新选项', id: 12 });
+            });
+
 
 
             form.on('submit(publish)', function (data) {
@@ -138,6 +159,7 @@
             });
 
 
+
             function GetQueryString(name, istop) {
                 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
                 var r = window.location.search.substr(1).match(reg);

WebRoot/view/tb/org/task_list.html

@@ -141,7 +141,7 @@
                     type: 2,
                     title: '发布任务',
                     shade: 0.1,
-                    area: ['650px', '500px'],
+                    area: ['1024px', '600px'],
                     content: './publish.html?job_id=' + obj.data.job_id
                 });
             }

WebRoot/view/tb/org/test.html

@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Demo</title>
+    <link rel="stylesheet" href="../../../component/pear/css/pear.css" />
+</head>
+
+<body>
+    <div class="layui-row">
+        <div class="layui-col-xs6">
+            <div class="grid-demo grid-demo-bg1">61/12</div>
+        </div>
+        <div class="layui-col-xs6">
+            <div class="grid-demo">6/12</div>
+        </div>
+    </div>
+    <div class="layui-row">
+        <div class="layui-col-xs3">
+            <div class="grid-demo grid-demo-bg1">3/12</div>
+        </div>
+        <div class="layui-col-xs3">
+            <div class="grid-demo">3/12</div>
+        </div>
+        <div class="layui-col-xs3">
+            <div class="grid-demo grid-demo-bg1">3/12</div>
+        </div>
+        <div class="layui-col-xs3">
+            <div class="grid-demo">3/12</div>
+        </div>
+    </div>
+
+    <script src="../../../component/layui/layui.js"></script>
+    <script src="../../../component/pear/pear.js"></script>
+
+</body>
+
+</html>