瀏覽代碼

2019-09-05 16:23

xs 5 年之前
父節點
當前提交
20ef939774

+ 27 - 42
src/main/webapp/webpage/modules/sg/project/addItemForm.js

@@ -1,50 +1,35 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <script type="text/javascript">
     layui.use(['form', 'layedit', 'laydate'], function(){
-    var form = layui.form;
-    form.render();
-    //自定义验证规则
-    form.verify({
-    context: function(value){
-    if(value.length <=0){
-    return '请选择导入的文件';
-}
-}
-});
+        var form = layui.form;
+        form.render();
+        //自定义验证规则
+        form.verify({
+        context: function(value){
+        if(value.length <=0){
+        return '请选择导入的文件';
+        }
+        }
+    });
     var newText1 = parent.$('#addtext').val();
-    $("#newText1").val(newText1);
-})
+        $("#newText1").val(newText1);
+    })
     function doSubmit(obj){
-    if ($("#myfile").val()==null||$("#myfile").val()==""){
-    layer.msg("请选择文件",{icon: 3});
-    throw SyntaxError;
-}
+        if ($("#myfile").val()==null||$("#myfile").val()==""){
+        layer.msg("请选择文件",{icon: 3});
+        throw SyntaxError;
+    }
     if ($("#inputwrite").val()==null||$("#inputwrite").val()==""){
-    layer.msg("请输入项目名称",{icon:3});
-    throw SyntaxError;
-}
-    //获取项目名称
-    var project_name=$("#inputwrite").val();
-    //获取工程id
-    var project_id=$("#newText1").val();
-    $.ajax({
-        url: "${ctx}/project/tem/verfiy",
-        type: "post",
-        data: {"projectName":project_name,"projectId":project_id},
-        success:function (result) {
-            if (result.code == 1){
-                layer.msg(result.msg,{icon:5});
-            }else {
-                $("#inputForm").submit();
-            }
-        }
-    });
+        layer.msg("请输入项目名称",{icon:3});
+        throw SyntaxError;
+    }
+    $("#inputForm").submit();
 }
-$("#btnxz").click(function(){
-    $("#myfile").trigger("click");
-})
-$("#myfile").bind("change",function(){
-    var w= $("#myfile").val();
-    $("#myspan").html('&nbsp;'+w);
-});
+    $("#btnxz").click(function(){
+        $("#myfile").trigger("click");
+        })
+    $("#myfile").bind("change",function(){
+        var solr_file= $("#myfile").val();
+        $("#view_input").val(solr_file);
+    })
 </script>

+ 45 - 44
src/main/webapp/webpage/modules/sg/project/addItemForm.jsp

@@ -6,58 +6,59 @@
 <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
 <html>
 <head>
-    <title>添加工程</title>
+    <title>添加项目</title>
+    <link rel="stylesheet" href="${ctxp}/static/plugin/assets/layui/css/layui.css">
+    <link rel="stylesheet" href="${ctxp}/static/plugin/assets/common.css"/>
+    <script type="text/javascript" src="${ctxp}/static/plugin/assets/jquery-3.2.1.min.js"></script>
+    <link rel="stylesheet" href="${ctxp}/static/plugin/assets/bootstrap.min.css">
     <style>
-        .layui-input{height: 28px;margin-top: 6px;}
+
+        .layui-input{ height: 28px;}
+        td{text-align: center;font-size: 14px;margin-top: 20px;color: #555}
+        .layui_td_1{text-align: center;font-size: 14px;}
+        .modal-body{padding: 10px}
     </style>
 </head>
 <body>
-<form id="inputForm"class="layui-form" action="${ctx}/project/import" method="post" enctype="multipart/form-data">
-    <input id="newText1" hidden name="projectId" value=""/>
-    <div class="layui-form-item">
-        <div class="layui-inline" style="margin-left:30px;margin-top: 10px;display: flex">
-            <input type="button" class="layui-btn-primary layui-btn-sm layui-btn-radius" onclick="uploadwj()" value="选择结算文件" id="btnxz"/>
-            <span id="myspan" style="flex: 1;margin-top: 4px">&nbsp;*结算书文件为博微导出xls/xlsx格式文件</span>
-            <input type="file" style="display: none;" accept=".xls,.xlsx"  name="file" id="myfile"/>
-        </div>
-    </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="">
+<form id="inputForm"class="layui-form" action="${ctx}/project/tem/importfile" method="post" enctype="multipart/form-data">
+    <div class="modal-body">
+        <%--<fieldset class="layui-elem-field layui-field-title">--%>
+        <%--<legend>222</legend>--%>
+        <%--</fieldset>--%>
+        <table class="table table-bordered table-striped"  width="800px">
+            <tr>
+                <td class="layui_td_1"><input type="button" class="layui-btn layui-btn-primary layui-btn-sm" value="选择结算文件" id="btnxz"/></td>
+                <td>
+                    <input type="text" autocomplete="off" readonly="readonly" class="layui-input" placeholder="*结算书文件为博微导出xls/xlsx格式文件" id="view_input" style="background-color: whitesmoke">
+                </td>
+            </tr>
+            <tr>
+                <td class="layui_td_1">*项目划分</td>
+                <td ><select name="type" lay-verify="required" lay-search="">
                     <option value="">请选择</option>
                     <option value="1">架空线路工程</option>
-                    <option value="2">电缆工程</option
+                    <option value="2">电缆工程</option>
                     <option value="3">变电站工程</option>
-                </select>
-            </div>
-        </div>
-    </div>
-    <div class="layui-form-item">
-        <div class="layui-inline">
-            <label class="layui-form-label">项目名称</label>
-            <div class="layui-input-inline">
-                <input type="text" name="name" autocomplete="off" class="layui-input" id="inputwrite">
-            </div>
-        </div>
-    </div>
-    <div class="layui-form-item">
-        <div class="layui-inline">
-            <label class="layui-form-label">项目编号</label>
-            <div class="layui-input-inline">
-                <input type="text" name="" autocomplete="off" class="layui-input">
-            </div>
-        </div>
-    </div>
-    <div class="layui-form-item">
-        <div class="layui-input-block">
-            <button class="layui-btn" lay-submit="" lay-filter="mysubmit" type="submit" id="newProject" style="display: none;">创建</button>
-            <!--<button type="reset" class="layui-btn layui-btn-primary">取消</button>-->
-        </div>
+                </select></td>
+            </tr>
+            <tr>
+                <td class="layui_td_1">*项目名称</td>
+                <td>
+                    <input type="text" name="name" autocomplete="off" class="layui-input" id="inputwrite">
+                </td>
+            </tr>
+            <tr>
+                <td class="layui_td_1">项目编号</td>
+                <td>
+                    <input type="text" name="" autocomplete="off" class="layui-input">
+                </td>
+            </tr>
+        </table>
     </div>
+    <input type="file" style="display: none;" accept=".xls,.xlsx"  name="file" id="myfile"/>
+    <input id="newText1" hidden name="projectId" value=""/>
 </form>
-<%@include file="addItemForm.js"%>
 </body>
+<script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
+<%@include file="addItemForm.js"%>
 </html>

+ 2 - 3
src/main/webapp/webpage/modules/sg/project/management.js

@@ -113,14 +113,13 @@ layui.config({
     treetable.foldAll('#table1');
     table.on('tool(table1)', function(obj,target){
         var data = obj.data;
-        //console.log(obj)
         if(obj.event == 'add'){
             $("#addtext").val(data.id);
             layui.use(['table','layer'],function(){
                 layer.open({
                     type: 2,
-                    title: '添加工程',
-                    area: ['40%', '80%'],
+                    title: '添加项目',
+                    area: ['60%', '80%'],
                     shade: 0.8,
                     shadeClose: true,
                     content: '${ctxp}/webpage/modules/sg/project/addItemForm.jsp'

+ 10 - 10
src/main/webapp/webpage/modules/sg/projecttem/addItem.js

@@ -6,17 +6,17 @@
         var newText1 = parent.$('#addtext').val();
         $("#newText1").val(newText1);
     })
-    function doSubmit(obj){
-        if ($("#myfile").val()==null||$("#myfile").val()==""){
-            layer.msg("请选择文件",{icon: 3});
-            throw SyntaxError;
-        }
-        if ($("#inputwrite").val()==null||$("#inputwrite").val()==""){
-            layer.msg("请输入项目名称",{icon:3});
-            throw SyntaxError;
-        }
-        $("#inputForm").submit();
+function doSubmit(obj){
+    if ($("#myfile").val()==null||$("#myfile").val()==""){
+        layer.msg("请选择文件",{icon: 3});
+        throw SyntaxError;
     }
+    if ($("#inputwrite").val()==null||$("#inputwrite").val()==""){
+        layer.msg("请输入项目名称",{icon:3});
+        throw SyntaxError;
+    }
+    $("#inputForm").submit();
+}
     $("#btnxz").click(function(){
         $("#myfile").trigger("click");
     })

+ 1 - 1
src/main/webapp/webpage/modules/sg/projecttem/addItem.jsp

@@ -53,7 +53,7 @@
         </table>
     </div>
     <input type="file" style="display: none;" accept=".xls,.xlsx"  name="file" id="myfile"/>
-    <input id="newText1" hidden name="projectId" value=""/>
+    <input id="newText1"  name="projectId" value=""/>
 </form>
 </body>
 <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>