Merge remote-tracking branch 'origin/master'

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

@@ -67,7 +67,7 @@
             dataType: "json",
             success: function(data){
                 if(data.success){
-                    layer.msg(data.msg, {icon: 1,offset:['38%','38%']},function () {
+                    layer.msg(data.msg, {icon: 6,offset:['38%','38%']},function () {
                         parent.location.reload();
                     });
                 }else{

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

@@ -24,6 +24,12 @@
         </div>
     </div>
     <div class="layui-inline">
+        <label class="layui-form-label">工程编号</label>
+        <div class="layui-input-inline">
+            <input type="text" name="projectNo" lay-verify="" autocomplete="off" class="layui-input" readonly="readonly" value="${data.projectNo}">
+        </div>
+    </div>
+    <div class="layui-inline">
         <label class="layui-form-label">创建时间</label>
         <div class="layui-input-inline">
             <input type="text" name="createDate" id="beginDate1" lay-verify="" readonly="readonly" placeholder="yyyy-MM-dd" autocomplete="off"

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

@@ -27,9 +27,15 @@
     <div class="layui-form-item" style="margin-top: 10px;">
         <input name="id" value="${data.id}" hidden>
         <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"  autocomplete="off" class="layui-input" value="${data.projectName}">
+                <input type="text" id="projectName" name="projectName"  autocomplete="off" class="layui-input" value="${data.projectName}">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label">*工程编号</label>
+            <div class="layui-input-inline">
+                <input type="text" id="projectNo" name="projectNo"  autocomplete="off" class="layui-input" value="${data.projectNo}">
             </div>
         </div>
         <div class="layui-inline">
@@ -101,13 +107,23 @@
 </script>
 <script>
     function updateProject(){
+        if ($("#projectName").val()==null||$("#projectName").val()==""){
+            layer.msg("请输入工程名称",{icon:3});
+            throw SyntaxError;
+        }
+        if($("#projectNo").val()==null||$("#projectNo").val()==""){
+            layer.msg("请输入工程编号",{icon:3});
+            throw SyntaxError;
+        }
         $.ajax({
             type:"post",
             url:"${ctx}/project/save",
             // data:JSON.stringify({id:newid2,type:xmmc2,fee:fyje2}),
             data:$('#updateForm').serialize(),
             success:function(result){
-                parent.location.reload();
+                layer.msg(result.msg, {icon: 5,offset:['38%','38%']},function () {
+                    parent.location.reload();
+                });
             }
         });
     }

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

@@ -18,7 +18,7 @@
     <c:forEach items="${list}" var="data" varStatus="index">
 <div class="layui-form-item" style="margin-top: 10px;">
     <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" autocomplete="off" class="layui-input" readonly="readonly" value="${data.projectName}">
         </div>
@@ -30,6 +30,12 @@
                    class="layui-input" value="<fmt:formatDate value="${data.createDate}" pattern="yyyy/MM/dd "/>">
         </div>
     </div>
+    <div class="layui-inline">
+        <label class="layui-form-label">单体工程编号</label>
+        <div class="layui-input-inline">
+            <input type="text" name="projectNo" autocomplete="off" class="layui-input" readonly="readonly" value="${data.projectNo}">
+        </div>
+    </div>
 </div>
 <div style="margin: 20px;">
     <fieldset class="layui-elem-field layui-field-title">

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

@@ -21,9 +21,9 @@
     <div class="layui-form-item" style="margin-top: 10px;">
         <input name="id" value="${data.id}" hidden>
         <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"  autocomplete="off" class="layui-input" value="${data.projectName}">
+                <input type="text" id="projectName" name="projectName"  autocomplete="off" class="layui-input" value="${data.projectName}">
             </div>
         </div>
         <div class="layui-inline">
@@ -33,6 +33,12 @@
                        class="layui-input" value="<fmt:formatDate value="${data.createDate}" pattern="yyyy/MM/dd "/>" style="background-color: whitesmoke">
             </div>
         </div>
+        <div class="layui-inline">
+            <label class="layui-form-label">*单体工程编号</label>
+            <div class="layui-input-inline">
+                <input type="text" id="projectNo" name="projectNo"  autocomplete="off" class="layui-input" value="${data.projectNo}">
+            </div>
+        </div>
     </div>
 </form>
 <div style="margin: 20px;">
@@ -96,13 +102,23 @@
 <script>
     //修改工程id
     function updateProject(){
+        if ($("#projectName").val()==null||$("#projectName").val()==""){
+            layer.msg("请输入工程名称",{icon:3});
+            throw SyntaxError;
+        }
+        if($("#projectNo").val()==null||$("#projectNo").val()==""){
+            layer.msg("请输入工程编号",{icon:3});
+            throw SyntaxError;
+        }
         $.ajax({
             type:"post",
             url:"${ctx}/project/save",
             // data:JSON.stringify({id:newid2,type:xmmc2,fee:fyje2}),
             data:$('#updateForm').serialize(),
             success:function(result){
-                parent.location.reload();
+                layer.msg(result.msg, {icon: 5,offset:['38%','38%']},function () {
+                    parent.location.reload();
+                });
             }
         });
     }