Merge branch 'master' of http://192.168.2.4:3000/chengqiang/sg_finalAcountAuto

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

@@ -40,19 +40,19 @@
             <tr>
                 <td>*项目名称</td>
                 <td>
-                    <input type="text" name="name" autocomplete="off" class="layui-input" id="inputwrite">
+                    <input type="text" name="itemName" autocomplete="off" class="layui-input" id="inputwrite">
                 </td>
             </tr>
             <tr>
                 <td>项目编号</td>
                 <td>
-                    <input type="text" name="" autocomplete="off" class="layui-input">
+                    <input type="text" name="itemNo" autocomplete="off" class="layui-input">
                 </td>
             </tr>
             <tr>
                 <td>施工单位</td>
                 <td>
-                    <input type="text" name="unit" autocomplete="off" class="layui-input">
+                    <input type="text" name="units" autocomplete="off" class="layui-input">
                 </td>
             </tr>
             </tbody>

src/main/webapp/webpage/modules/sg/projecttem/addItem.jsp

@@ -36,19 +36,19 @@
             <tr>
                 <td>*项目名称</td>
                 <td>
-                    <input type="text" name="name" autocomplete="off" class="layui-input" id="inputwrite">
+                    <input type="text" name="itemName" autocomplete="off" class="layui-input" id="inputwrite">
                 </td>
             </tr>
             <tr>
                 <td>项目编号</td>
                 <td>
-                    <input type="text" name="" autocomplete="off" class="layui-input">
+                    <input type="text" name="itemNo" autocomplete="off" class="layui-input">
                 </td>
             </tr>
             <tr>
                 <td>施工单位</td>
                 <td>
-                    <input type="text" name="unit" autocomplete="off" class="layui-input">
+                    <input type="text" name="units" autocomplete="off" class="layui-input">
                 </td>
             </tr>
             </tbody>

src/main/webapp/webpage/modules/sg/projecttem/addItem2Form.js

@@ -20,10 +20,11 @@ layui.use('upload', function(){
                 arrayFile.push(file);
                 var tr = $(['<tr id='+index+'>'
                     ,'<td hidden><div class="td_id">'+index+'</div></td>'
-                    ,'<td>'+ file.name +'</td>'
-                    ,'<td><div contenteditable="true" class="mydiv1" placeholder="请输入项目名称">'+file.name.split(".")[0]+'</div></td>'
+                    ,'<td><div contenteditable="true" class="mydiv1 mydiv" placeholder="请输入项目名称">'+file.name.split(".")[0]+'</div></td>'
                     ,'<td>'
                     ,' <select name="type" class="myselect"><option value="">请选择项目类型</option><option value="1">架空线路工程</option><option value="2">电缆工程</option><option value="3">变电站工程</option></select>'
+                    ,'<td><div contenteditable="true" class="mydiv2 mydiv" placeholder="请输入项目编号"></div></td>'
+                    ,'<td><div contenteditable="true" class="mydiv3 mydiv" placeholder="请输入施工单位"></div></td>'
                     ,'<td style="text-align: center">'
                     ,'<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">删除</button>'
                     ,'</td>'
@@ -106,6 +107,21 @@ function okSubmit() {
             }
         }
     }
+        // 获取项目编号
+        var div2 =  document.getElementsByClassName("mydiv2");
+        var div2value=[];
+        for (var i = 0; i < div2.length; i++) {
+            div2value[i]=div2[i].innerHTML;
+        }
+        formdata.append("itemNo",div2value);
+
+        // 获取项目编号
+        var div3 =  document.getElementsByClassName("mydiv3");
+            var div3value=[];
+            for (var i = 0; i < div3.length; i++) {
+                div3value[i]=div3[i].innerHTML;
+            }
+        formdata.append("units",div3value);
     //加载提示
     layer.msg('加载中', {
         icon: 16

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

@@ -13,10 +13,10 @@
         .layui-input{ height: 28px;margin-top: 6px;}
         .layui-table-view .layui-table {width:100%}
         .myselect{border: none;padding: 5px 7px;min-height: 20px;color: #666666;}
-        .mydiv1{padding: 5px 7px;min-height: 20px;border: whitesmoke;}
+        .mydiv{padding: 5px 7px;min-height: 20px;border: whitesmoke;}
         .layui-btn-mysele{width: 70px;}
-        .mydiv1:empty:before{content: attr(placeholder);color:#999999;}
-        .mydiv1:focus:before{content:none}
+        .mydiv:empty:before{content: attr(placeholder);color:#999999;}
+        .mydiv:focus:before{content:none}
         .layui-table-tips-main{display:none}
         .layui-table-tips-c{display:none}
     </style>
@@ -50,10 +50,11 @@
                                         <table class="layui-table" id="mytable">
                                         <thead>
                                         <tr>
-                                            <th width="35%">文件名</th>
-                                            <th width="35%">项目名称</th>
-                                            <th width="15%">项目类型</th>
-                                            <th width="15%" style="text-align: center">操作</th>
+                                            <th width="36%">项目名称</th>
+                                            <th width="17%">项目类型</th>
+                                            <th width="17%">项目编号</th>
+                                            <th width="20%">施工单位</th>
+                                            <th width="10%" style="text-align: center">操作</th>
                                         </tr></thead>
                                         <tbody id="tbody_List">