Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/webapp/webpage/modules/sg/project/addItem2Form.jsp

src/main/webapp/webpage/modules/sg/project/addItem2Form.jsp

@@ -47,9 +47,13 @@
         }
         .layui-table-view .layui-table {width:100%}
         .myselect{
-            width: 100%;
-            height: 30px;
-            font-size: 15px;
+            border: none;
+            padding: 5px 7px;
+            min-height: 20px;
+        }
+        .mydiv1{
+            padding: 5px 7px;
+            min-height: 20px;
         }
     </style>
 </head>
@@ -61,16 +65,15 @@
             <div class="layui-col-md12">
                 <div class="layui-card">
                     <div class="layui-card-header layui-card-header-add">工程管理</div>
-                    <%--<form id="inputForm"class="layui-form" action="${ctx}/project/tem/import" method="post" enctype="multipart/form-data">--%>
                         <div class="layui-card-body" style="margin-top: 2px;">
                             <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
                                 <legend style="font-size: 15px;">选择工程</legend>
                             </fieldset>
                             <div class="layui-form-item">
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">*工程名称</label>
+                                    <label class="layui-form-label" >*工程名称</label>
                                     <div class="layui-input-inline">
-                                        <input type="text" name="projectName" lay-verify="title" class="layui-input">
+                                        <input type="text" id="myinput" class="layui-input">
                                     </div>
                                 </div>
                             </div>
@@ -80,9 +83,10 @@
                             <div class="layui-upload">
                                 <button type="button" class="layui-btn layui-btn-normal" id="testList">选择文件</button>
                                 <div class="layui-upload-list">
-                                    <table class="layui-table" id="table">
+                                    <table class="layui-table" id="mytable">
                                         <thead>
-                                        <tr><th hidden>项目</th>
+                                        <tr>
+                                            <th hidden>文件</th>
                                             <th>文件名</th>
                                             <th>项目名称</th>
                                             <th>项目类型</th>
@@ -91,65 +95,45 @@
                                         <tbody id="demoList"></tbody>
                                     </table>
                                 </div>
-                                <button type="button" class="layui-btn" id="testListAction" onclick="sub()">确定</button>
+
                             </div>
-                            <%--<!---------列表---------->--%>
-                            <%--<div class="layui-form-item">--%>
-                                <%--<div class="layui-inline">--%>
-                                    <%--<label class="layui-form-label">*项目划分</label>--%>
-                                    <%--<div class="layui-input-inline">--%>
-                                        <%--<select name="type" lay-verify="required" lay-search="">--%>
-                                            <%--<option value="">请选择</option>--%>
-                                            <%--<option value="1">架空线路工程</option>--%>
-                                            <%--<option value="2">电缆工程</option>--%>
-                                        <%--</select>--%>
-                                    <%--</div>--%>
-                    <%--</form>--%>
+                            <button type="button" class="layui-btn" onclick="okSubmit()">确定</button>
                 </div>
             </div>
         </div>
     </div>
 </body>
 <script>
+    // var files;
     layui.use(['upload','form'],function(){
         var $ = layui.jquery
             ,form = layui.form
             ,upload = layui.upload;
-
         //多文件列表示例
         var demoListView = $('#demoList')
             ,uploadListIns = upload.render({
             elem: '#testList'
-            ,url: '/sddd'
+            // ,url: '/sddd'
             ,accept: 'file'
             ,multiple: true
             ,auto: false
-            // ,bindAction: '#testListAction'
             ,choose: function(obj){
                 var files = this.files = obj.pushFile(); //将每次选择的文件追加到文件队列
                 //读取本地文件
-                // var xml = "<select name=\"type\"><option value=\"\">请选择</option><option value=\"1\">架空线路工程</option><option value=\"2\">电缆工程</option></select>";
                 obj.preview(function(index, file, result){
                     var tr = $(['<tr id="upload-'+ index +'">'
-                        ,'<td hidden>'+ file +'</td>'
+                        ,'<td style="display: none" ">'+file+'</td>'
                         ,'<td>'+ file.name +'</td>'
+                        ,'<td><div contenteditable="true" class="mydiv1">请输入项目名称</div></td>'
                         ,'<td>'
-                        ,' <input type="text" >'
-                        ,'</td>'
-                        ,'<td>'
-                        ,' <select name="type" class="myselect" id="myselect"><option value="">请选择</option><option value="1">架空线路工程</option><option value="2">电缆工程</option></select>'
+                        ,' <select name="type" class="myselect"><option value="">请选择项目类型（必选）</option><option value="1">架空线路工程</option><option value="2">电缆工程</option></select>'
                         ,'</td>'
                         ,'<td>'
-                        ,'<button class="layui-btn layui-btn-xs demo-reload layui-hide">重传</button>'
+                        // ,'<button class="layui-btn layui-btn-xs demo-reload layui-hide">重传</button>'
                         ,'<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">删除</button>'
                         ,'</td>'
                         ,'</tr>'].join(''));
 
-                    // 单个重传
-                    // tr.find('.demo-reload').on('click', function(){
-                    //     obj.upload(index, file);
-                    // });
-
                     //删除
                     tr.find('.demo-delete').on('click', function(){
                         delete files[index]; //删除对应的文件
@@ -160,38 +144,71 @@
                     demoListView.append(tr);
                 });
             }
-
-//  ,done: function(res, index, upload){
-//    if(res.code == 0){ //上传成功
-//      var tr = demoListView.find('tr#upload-'+ index)
-//      ,tds = tr.children();
-//      tds.eq(2).html('<span style="color: #5FB878;">上传成功</span>');
-//      tds.eq(3).html(''); //清空操作
-//      return delete this.files[index]; //删除文件队列已经上传成功的文件
-//    }
-//    this.error(index, upload);
-//  }
-//  ,error: function(index, upload){
-//    var tr = demoListView.find('tr#upload-'+ index)
-//    ,tds = tr.children();
-//    tds.eq(2).html('<span style="color: #FF5722;">上传失败</span>');
-//    tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //显示重传
-//  }
         });
 
     });
 </script>
 <script>
-    function sub() {
+    function okSubmit() {
+        var inputval = $("#myinput").val();
+
+        var div1 =  document.getElementsByClassName("mydiv1");
+        var divvalue=[];
+        for (var i = 0; i < div1.length; i++) {
+            divvalue[i]=div1[i].innerHTML;
+        }
+
+        var select1=document.getElementsByClassName("myselect");
+        var selectval=[];
+        for (var i = 0; i < select1.length; i++) {
+            selectval[i]=select1[i].value;
+        }
+
+
         var array = [];
-        $("#table tr").each(function () {
+        $("#mytable tr").each(function () {
             var text = $(this).children("td:first-child").text();
             if(text != null){
-                array.push(text)
+                array.push(text);
             }
         })
         array.splice(0,1);
-        alert(array);
+        /*
+            1/工程名称inputval
+            /文件名称array
+            2/项目名称divvalue
+            3/项目类型selectval
+         */
+        $.ajax({
+            type: "post",
+            url: "/alink-hq/checkCode",
+            data: {
+                "projectName": inputval,
+                "flies":array,
+                "itemNames":divvalue,
+                "itemTypes":selectval
+            },
+            // async: false,
+            success: function (res) {
+
+            }
+        })
     }
 </script>
+<%--<script>--%>
+    <%--function AutoContent(type) {--%>
+        <%--if (type=="in"){--%>
+            <%--var input2val = $("#myinput").val();--%>
+            <%--if (input2val=="请输入项目名称"){--%>
+                <%--$("#myinput").html("");--%>
+            <%--}--%>
+        <%--}--%>
+        <%--if (type=="out"){--%>
+            <%--var input2val = $("#myinput").val();--%>
+            <%--if (input2val==""){--%>
+                <%--$("#myinput").html("请输入项目名称");--%>
+            <%--}--%>
+        <%--}--%>
+    <%--}--%>
+<%--</script>--%>
 </html>