Domovská stránka Prehľadávať Pomoc
Registrovať Prihlásiť sa
chengqiang
/
sg_finalAcountAuto
1
0
Fork 0
Súbory Issues 0 Pull requesty 0 Wiki
Prechádzať zdrojové kódy

2019-09-27 0845

xs 5 rokov pred
rodič
c2f885989f
commit
afe0a5c999
8 zmenil súbory, kde vykonal 65 pridanie a 53 odobranie
Rozdelené zobrazenie Ukázať štatistiku rozdielnych dát
  1. 1 0
      src/main/webapp/static/plugin/assets/vermeit.css
  2. 1 1
      src/main/webapp/webpage/modules/sg/project/management.js
  3. 2 4
      src/main/webapp/webpage/modules/sg/project/management.jsp
  4. 26 2
      src/main/webapp/webpage/modules/sg/project/updateItemForm.jsp
  5. 4 42
      src/main/webapp/webpage/modules/sg/projecttem/addItem2Form.js
  6. 4 1
      src/main/webapp/webpage/modules/sg/projecttem/addItem2Form.jsp
  7. 1 1
      src/main/webapp/webpage/modules/sg/projecttem/manageList.jsp
  8. 26 2
      src/main/webapp/webpage/modules/sg/projecttem/updateItem.jsp

+ 1 - 0
src/main/webapp/static/plugin/assets/vermeit.css
Zobraziť súbor 

@@ -17,6 +17,7 @@
 
 }
 
 .formbtn{
 
     width: 40px;
 
+    min-width: 40px;
 
 }
 
 .input-meself-time{
 
     font-size: 13px;

+ 1 - 1
src/main/webapp/webpage/modules/sg/project/management.js
Zobraziť súbor 

@@ -55,7 +55,7 @@ layui.config({
 
                                 +"<a style='margin-top: 3px;' class='layui-btn layui-btn-xs layui-btn-danger' id=delPro"+d.id+" onclick=\"deleteProject('"+d.id+"')\">删除</a>"
 
                                 // +"<br>"
 
                                 +"<a style='margin-top: 3px;' class='layui-btn layui-btn-warm layui-btn-xs' lay-event=''href=\"${ctx}/project/exportone?id=" + d.id+"\">单体工程导出</a>"
 
-                                +"<a style='margin-top: 3px;' class='layui-btn layui-btn-warm layui-btn-xs' lay-event=''href=\"${ctx}/project/export?id=" + d.id+"\">导出</a><div>";
 
+                                // +"<a style='margin-top: 3px;' class='layui-btn layui-btn-warm layui-btn-xs' lay-event=''href=\"${ctx}/project/export?id=" + d.id+"\">导出</a><div>";
 
 
                         }
 
                         if(d.status==2){ //项目表头操作

+ 2 - 4
src/main/webapp/webpage/modules/sg/project/management.jsp
Zobraziť súbor 

@@ -23,7 +23,7 @@
 
     .layui-table-tips-c{display:none}
 
     .layui-table-cell {height: inherit;}
 
 </style>
 
-<body style="height: 100%">
 
+<body style="height: 100%;line-height: 100%">
 
 <input style="display: none;" id="addtext" value=""/>
 
 <div class="layui-main-bgc">
 
     <sys:message content="${message}"/>
 
@@ -101,12 +101,10 @@
 
                                    </div>
 
                                </div>
 
 
-                               <div class="layui-inline">
 
+                               <div class="layui-inline" style="display: inline">
 
                                    <div class="col-xs-12 col-sm-6 col-md-4 layui-mesl-mit">
 
-
 
                                     <button class="layui-btn layui-btn-primary layui-btn-radius formbtn" lay-submit="" lay-filter="mybtnsubmit">查询</button>
 
                                     <button type="reset" class="layui-btn layui-btn-primary layui-btn-radius formbtn" style="margin-left: 1px">重置</button>
 
-
 
                                     </div>
 
                                </div>
 
                            </div>

+ 26 - 2
src/main/webapp/webpage/modules/sg/project/updateItemForm.jsp
Zobraziť súbor 

@@ -19,6 +19,7 @@
 
     .layui-input{height: 28px;margin-top: 6px;line-height: 28px/*background: whitesmoke;*/}
 
     .layui-form-label { float: left;display: block;padding: 9px 15px;width: 100px;font-weight: 400;line-height: 20px;text-align: right;}
 
     .layui-table-view .layui-table {width:100%}
 
+    .mydiv{padding: 5px 7px;border: whitesmoke;line-height: 98%;margin-top: 2px}
 
 </style>
 
 <body>
 
 <c:if test="${ not empty list}">
 
@@ -46,6 +47,8 @@
 
             </div>
 
         </div>
 
     </div>
 
+    <input style="display: none" id="inputId" name="ids" value="">
 
+    <input style="display: none" id="inputUnits" name="units" value="">
 
 </form>
 
 <div style="margin: 20px;">
 
     <fieldset class="layui-elem-field layui-field-title">
 
@@ -71,7 +74,11 @@
 
             elem: '#updatetable'
 
             ,cols: [[
 
                 {field:'xmmc',title:'结算书名称'}
 
-                ,{field:'sgdw',title:'供应商'}
 
+                ,{field:'sgdw',title:'供应商',templet:function(d){
 
+                        var updateXml= "<div contenteditable='true' class='mydiv1 mydiv'>"+d.sgds+"</div>"+
 
+                            "<div style='display: none' class='mydiv2'>"+d.id+"</div>";
 
+                        return updateXml;
 
+                    }}
 
                 ,{field:'xmlx',title:'结算书类型'}
 
                 // ,{field:'xmbh',title:'结算书编号'}
 
                 ,{field:'op',align:'center',title:"操作",templet:function(d){
 
@@ -87,7 +94,7 @@
 
                     "id":"${data1.id}",
 
                     "type":"${data1.type}",
 
                     "xmmc": "${data1.itemName}",
 
-                    "sgdw": "${data1.unit}",
 
+                    "sgds": "${data1.unit}",
 
                     "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if><c:if test="${data1.type eq '3'}">"变电站工程"</c:if>,
 
                     <%--"xmbh":"${data1.itemNo}"--%>
 
                 },
 
@@ -115,6 +122,23 @@
 
             layer.msg("请输入工程编号",{icon:3});
 
             throw SyntaxError;
 
         }
 
+        var div_value =  $(".mydiv1");
 
+        var nameString = "";
 
+        for (var i = 0; i < div_value.length; i++) {
 
+            nameString+=div_value[i].innerText+",";
 
+        }
 
+        var name = nameString.substring(0,nameString.length-1);
 
+
 
+
 
+        var div_value2 = $(".mydiv2");
 
+        var idString = "";
 
+        for (var i = 0; i < div_value2.length; i++) {
 
+            idString+=div_value2[i].innerText+",";
 
+        }
 
+        var id = idString.substring(0,idString.length-1);
 
+
 
+        $("#inputId").val(id);
 
+        $("#inputUnits").val(name);
 
         $.ajax({
 
             type:"post",
 
             url:"${ctx}/project/save",

+ 4 - 42
src/main/webapp/webpage/modules/sg/projecttem/addItem2Form.js
Zobraziť súbor 

@@ -69,31 +69,23 @@ function okSubmit() {
 
     formdata.set("projectNo",dt_number); //添加工程名称到表单中
 
 
     //获取输入的项目名称
 
-    var div1 =  document.getElementsByClassName("mydiv1");
 
-    // //获取项目类型
 
-    // var select1=document.getElementsByClassName("myselect");
 
-    // 获取项目编号
 
-    // var div2 =  document.getElementsByClassName("mydiv2");
 
+    var div1 =  $(".mydiv1");
 
     // 获取施工单位
 
-    var div3 =  document.getElementsByClassName("mydiv3");
 
+    var div3 =  $(".mydiv3");
 
 
     //判断列表中项目名称是否为空
 
     if (div1.length<=0){
 
         layer.msg("请输入结算书名称",{icon: 3,offset:['40%','40%']});
 
         return false;
 
     }
 
-    // //判断项目类型是否存在
 
-    // if (select1.length<=0){
 
-    //     layer.msg("请选择项目名称",{icon: 3,offset:['40%','40%']});
 
-    //     return false;
 
-    // }
 
     //存储列表中 输入项目名称的值
 
     var divvalue=[];
 
     //存储列表中 输入项目名称的值
 
     var div_val=[];
 
     //循环获取当前项目列表的项目名称
 
+
 
     for (var i = 0; i < div1.length; i++) {
 
-    //存放到集合当中
 
+        //存放到集合当中
 
         divvalue[i]=div1[i].innerHTML;
 
         div_val[i]=div1[i].innerHTML;
 
     }
 
@@ -111,36 +103,6 @@ function okSubmit() {
 
     // 添加项目名称到表单当中
 
     formdata.set("itemNames",divvalue); //
 
 
-    // // 获取表格项目类型
 
-    // var selectval=[];
 
-    // //项目类型赋值给数组
 
-    // for (var i = 0; i < select1.length; i++) {
 
-    //     selectval[i]=select1[i].value;
 
-    // }
 
-    // //判断项目类型是否存在
 
-    // for (var i = 0; i < selectval.length; i++) {
 
-    //     if (selectval[i]==""||selectval[i]==null){
 
-    //         layer.msg("请选择项目类型",{icon: 3,offset:['40%','40%']});
 
-    //         throw SyntaxError;
 
-    //     }
 
-    // }
 
-    // //添加项目类型到表单中
 
-    // formdata.set("itemTypes",selectval);
 
-
 
-    //存放项目编号数组
 
-    // var div2value=[]; //定义存储项目标号类型
 
-    // for (var i = 0; i < div2.length; i++) {
 
-    //     div2value[i]=div2[i].innerHTML;
 
-    // }
 
-    // //判断项目编号
 
-    // for(var j = 0 ; j < div2value.length ; j++){
 
-    //     if (div2value[j]==null||div2value[j]==""){
 
-    //         layer.msg("请输入项目编号",{icon: 3,offset:['40%','40%']});
 
-    //         throw SyntaxError;
 
-    //     }
 
-    // }
 
-    // //添加到表单当中
 
-    // formdata.set("itemNo",div2value);
 
 
     var div3value=[];
 
     for (var i = 0; i < div3.length; i++) {

+ 4 - 1
src/main/webapp/webpage/modules/sg/projecttem/addItem2Form.jsp
Zobraziť súbor 

@@ -9,6 +9,9 @@
 
 <html>
 
 <head>
 
     <title>添加工程</title>
 
+    <meta http-equiv=Content-Type content=“text/html;charset=utf-8″>
 
+    <meta http-equiv=X-UA-Compatible content=IE=EmulateIE7>
 
+    <meta name="renderer" content="webkit">
 
     <style>
 
         .layui-input{ height: 28px;margin-top: 6px;line-height: 28px}
 
         .layui-table-view .layui-table {width:100%}
 
@@ -20,7 +23,7 @@
 
         .layui-table-tips-c{display:none}
 
     </style>
 
 </head>
 
-<body style="height: 100%;">
 
+<body style="height: 100%;line-height: 100%">
 
 <div style="padding: 10px; background-color: #F2F2F2;">
 
     <div class="layui-main-bgc">
 
         <%--<sys:message content="${message}"/>--%>

+ 1 - 1
src/main/webapp/webpage/modules/sg/projecttem/manageList.jsp
Zobraziť súbor 

@@ -34,7 +34,7 @@
 
                             <%--<a class="layui-btn layui-btn-meself" href="${ctx}/project/tem/indexlist"><img class="layui-meself-img1" src="${ctxp}/icon/back.png" alt="">&nbsp;返回</a>--%>
 
                             <%--<button type="button" class="layui-btn layui-btn-primary layui-btn-meself"  onclick="refresh()"><img class="layui-meself-img1" src="${ctxp}/icon/refush.png" alt="">&nbsp;刷新</button>--%>
 
                             <c:forEach items="${list}" var="data1" varStatus="index">
 
-                            <a type="button" class="layui-btn layui-btn-warm  layui-btn-meself" href="${ctx}/project/export?id=${data1.id}"><img class="layui-meself-img1" src="${ctxp}/icon/daochu.png" alt="">&nbsp;导出</a>
 
+                            <a type="button" class="layui-btn layui-btn-warm  layui-btn-meself" href="${ctx}/project/exportone?id=${data1.id}"><img class="layui-meself-img1" src="${ctxp}/icon/daochu.png" alt="">&nbsp;导出</a>
 
                             </c:forEach>
 
                         </div>
 
                         <table id="table1" class="layui-table" lay-filter="table1"></table>

+ 26 - 2
src/main/webapp/webpage/modules/sg/projecttem/updateItem.jsp
Zobraziť súbor 

@@ -13,6 +13,7 @@
 
     .layui-input{height: 28px;margin-top: 6px;line-height: 28px /*background: whitesmoke;*/}
 
     .layui-form-label {float: left;display: block;padding: 9px 15px;width: 100px;font-weight: 400;line-height: 20px;text-align: right;}
 
     .layui-table-view .layui-table {width:100%}
 
+    .mydiv{padding: 5px 7px;border: whitesmoke;line-height: 98%;margin-top: 2px}
 
 </style>
 
 <body>
 
 <c:if test="${ not empty list}">
 
@@ -40,6 +41,8 @@
 
             </div>
 
         </div>
 
     </div>
 
+    <input style="display: none" id="inputId" name="ids" value="">
 
+    <input style="display: none" id="inputUnits" name="units" value="">
 
 </form>
 
 <div style="margin: 20px;">
 
     <fieldset class="layui-elem-field layui-field-title">
 
@@ -66,7 +69,11 @@
 
             elem: '#updatetable'
 
             ,cols: [[
 
                 {field:'xmmc',title:'结算书名称'}
 
-                ,{field:'sgdw',title:'供应商'}
 
+                ,{field:'sgdw',title:'供应商',templet:function(d){
 
+                        var updateXml= "<div  contenteditable='true' class='mydiv1 mydiv'>"+d.sgds+"</div>"+
 
+                            "<div style='display: none' class='mydiv2'>"+d.id+"</div>";
 
+                        return updateXml;
 
+                    }}
 
                 ,{field:'xmlx',title:'结算书类型'}
 
                 // ,{field:'xmbh',title:'结算书编号'}
 
                 ,{field:'op',align:'center',title:"操作",width:100,templet:function(d){
 
@@ -83,7 +90,7 @@
 
                     "projectId":"${data1.projectId}",
 
                     "type":"${data1.type}",
 
                     "xmmc": "${data1.itemName}",
 
-                    "sgdw": "${data1.unit}",
 
+                    "sgds": "${data1.unit}",
 
                     "xmlx":<c:if test="${data1.type eq '1'}">"架空线路"</c:if><c:if test="${data1.type eq '2'}">"电缆线路"</c:if><c:if test="${data1.type eq '3'}">"变电站工程s"</c:if>,
 
                     <%--"xmbh":"${data1.itemNo}"--%>
 
                 },
 
@@ -110,6 +117,23 @@
 
             layer.msg("请输入工程编号",{icon:3});
 
             throw SyntaxError;
 
         }
 
+
 
+        var div_value =  $(".mydiv1");
 
+        var nameString = "";
 
+        for (var i = 0; i < div_value.length; i++) {
 
+            nameString+=div_value[i].innerText+",";
 
+        }
 
+        var name = nameString.substring(0,nameString.length-1);
 
+
 
+
 
+        var div_value2 = $(".mydiv2");
 
+        var idString = "";
 
+        for (var i = 0; i < div_value2.length; i++) {
 
+            idString+=div_value2[i].innerText+",";
 
+        }
 
+        var id = idString.substring(0,idString.length-1);
 
+        $("#inputId").val(id);
 
+        $("#inputUnits").val(name);
 
         $.ajax({
 
             type:"post",
 
             url:"${ctx}/project/save",