Strona główna Odkrywaj Pomoc
Zarejestruj się Zaloguj się
user2
/
xg_total_process
2
0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

提示修改

Enford 5 lat temu
rodzic
5321158895
commit
420fd459d4
11 zmienionych plików z 2561 dodań i 0 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 198 0
      src/main/webapp/webpage/modules/workmaterialcollect/gridselectWork.jsp
  2. 134 0
      src/main/webapp/webpage/modules/workmaterialcollect/modelCollect/workMaterialCollectModelList.jsp
  3. 63 0
      src/main/webapp/webpage/modules/workmaterialcollect/modelCollect/workMaterialCollectModelProjectView.jsp
  4. 54 0
      src/main/webapp/webpage/modules/workmaterialcollect/modelCollect/workMaterialCollectModelView.jsp
  5. 388 0
      src/main/webapp/webpage/modules/workmaterialcollect/workMaterialCollectEngineerForm.jsp
  6. 273 0
      src/main/webapp/webpage/modules/workmaterialcollect/workMaterialCollectEngineerList.jsp
  7. 276 0
      src/main/webapp/webpage/modules/workmaterialcollect/workMaterialCollectEngineerSureForm.jsp
  8. 275 0
      src/main/webapp/webpage/modules/workmaterialcollect/workMaterialCollectEngineerSureList.jsp
  9. 352 0
      src/main/webapp/webpage/modules/workmaterialcollect/workMaterialCollectEngineerView.jsp
  10. 274 0
      src/main/webapp/webpage/modules/workmaterialcollect/workMaterialCollectTotalList.jsp
  11. 274 0
      src/main/webapp/webpage/modules/workmaterialcollect/workMaterialCollectTotalSureView.jsp

+ 198 - 0
src/main/webapp/webpage/modules/workmaterialcollect/gridselectWork.jsp
Wyświetl plik 

@@ -0,0 +1,198 @@
 
+<%@ page contentType="text/html;charset=UTF-8" %>
 
+<%@ include file="/webpage/include/taglib.jsp"%>
 
+<html>
 
+<head>
 
+	<meta name="decorator" content="default"/>
 
+	<script type="text/javascript">
 
+        var validateForm;
 
+        function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 
+            if(obj == 2){
 
+                $("#inputForm").attr("action","${ctx}/workstockcontract/workStockContract/store");
 
+            }else{
 
+                $("#inputForm").attr("action","${ctx}/workstockcontract/workStockContract/save");
 
+            }
 
+            if($("#file_attachment tr").length==0){
 
+                top.layer.alert('请上传采集文件！', {icon: 0});
 
+                return false;
 
+            }
 
+            return true;
 
+        }
 
+        var url = "";
 
+        var name = "";
 
+        function insertTitle(tValue){
 
+            var files = $("#attachment_file")[0].files;
 
+            if (files.length>1){
 
+                top.layer.alert('最多上传一个文件！', {icon: 0});
 
+                return false;
 
+			}
 
+            for(var i = 0;i<files.length;i++) {
 
+                var file = files[i];
 
+                var attachmentId = $("#id").val();
 
+                var attachmentFlag = "91";
 
+                /*console.log(file);*/
 
+                var timestamp=new Date().getTime();
 
+
 
+                var storeAs = "workMaterialCollect/collectFile/attachment-file/workMaterialCollectType/"+timestamp+"/"+file['name'];
 
+                var uploadPath="http://newxgccpm.su.bcebos.com/"+storeAs;/*将这段字符串存到数据库即可*/
 
+                url = uploadPath;
 
+                var divId = "_attachment";
 
+                var names =  storeAs.split("/");
 
+                name = names[names.length-1];
 
+                $("#addFile"+divId).show();
 
+                multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,0);}
 
+        }
 
+		$(document).ready(function() {
 
+			    $('#contentTable thead tr th input.i-checks').on('ifChecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定 
+			    	  $('#contentTable tbody tr td input.i-checks').iCheck('check');
 
+			    	});
 
+			    $('#contentTable thead tr th input.i-checks').on('ifUnchecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定 
+			    	  $('#contentTable tbody tr td input.i-checks').iCheck('uncheck');
 
+			    	});
 
+		});
 
+        function addFile() {
 
+            var files = $("#attachment_file")[0].files;
 
+            if (files.length<1){
 
+                $("#attachment_file").click();
 
+            }else {
 
+                top.layer.alert('最多上传一个文件！', {icon: 0});
 
+			}
 
+        }
 
+
 
+		function getSelectedItem(){
 
+			var projectType = $("#projectType").val();
 
+			// alert(projectType);
 
+			var projectPart = $("#projectPart").val();
 
+			// var size = $("#contentTable tbody tr td input.i-checks:checked").size();
 
+			//   if(size == 0 ){
 
+			// 		top.layer.alert('请至少选择一条数据!', {icon: 0, title:'警告'});
 
+			// 		return "-1";
 
+			// 	  }
 
+			//   /*if(size > 1 ){
 
+			// 		top.layer.alert('只能选择一条数据!', {icon: 0, title:'警告'});
 
+			// 		return "-1";
 
+			// 	  }*/
 
+            var arr=new Array();
 
+            // var id =  $(this).attr("id");
 
+            var itemName = projectType;
 
+            var itemNumber = projectPart;
 
+            var engineerId = url;
 
+            var uploadName = name;
 
+            var data= {'projectType':itemName,'projectPart':itemNumber,'attachmentName':uploadName,'url':engineerId};
 
+            arr.push(data);
 
+            // $("#contentTable tbody tr td input.i-checks:checkbox:checked").each(function () {
 
+            //     var id =  $(this).attr("id");
 
+            //     var itemName = $(this).parent().parent().parent().find(".codelabe2").html();
 
+            //     var itemNumber = $(this).parent().parent().parent().find(".codelabe3").html();
 
+            //     var data= {'id':id,'name':itemName,'number':itemNumber,'type':type,'model':model,'primaryUnit':primaryUnit,'isAssets':isAssets};
 
+            //     arr.push(data);
 
+			// })
 
+            return arr;
 
+		}
 
+
 
+		function changeProjectTypess(obj) {
 
+			// alert(obj);
 
+        }
 
+	</script>
 
+</head>
 
+<body>
 
+<div class="single-form">
 
+	<div class="container">
 
+		<form:form id="inputForm" modelAttribute="workMaterialCollectType" action="" method="post" class="form-horizontal" >
 
+			<form:hidden path="id"/>
 
+			<input type="hidden" name="url" value="${url}"/>
 
+			<input type="hidden" name="fieldLabels" value="${fieldLabels}"/>
 
+			<input type="hidden" name="fieldKeys" value="${fieldKeys}"/>
 
+			<input type="hidden" name="searchLabel" value="${searchLabel}"/>
 
+			<input type="hidden" name="searchKey" value="${searchKey}"/>
 
+			<div class="form-group layui-row first">
 
+				<div class="form-group-label"><h2>基础信息</h2></div>
 
+				<div class="layui-item layui-col-sm6">
 
+					<label class="layui-form-label"><span class="require-item">*</span>工程类型：</label>
 
+					<div class="layui-input-block">
 
+						<form:select id="projectType" path="projectType" onchange="changeProjectTypess(this.value);" class="form-control simple-select required">
 
+							<%--<form:option value="" label=""/>--%>
 
+							<form:options id="test" items="${fns:getDictList('work_material_engineer_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
 
+						</form:select>
 
+					</div>
 
+				</div>
 
+				<div class="layui-item layui-col-sm6">
 
+					<label class="layui-form-label"><span class="require-item">*</span>工程部位：</label>
 
+					<div class="layui-input-block">
 
+						<form:select path="projectPart" id="projectPart" onchange="changeTryEndTime(this.value);" class="form-control simple-select required">
 
+							<%--<form:option value="" label=""/>--%>
 
+							<form:options items="${fns:getDictList('work_material_engineer_part1')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
 
+						</form:select>
 
+					</div>
 
+				</div>
 
+				<div class="form-group layui-row">
 
+					<div class="form-group-label"><h2>附件信息</h2></div>
 
+					<div class="layui-item nav-btns">
 
+						<a id="attachment_btn" class="nav-btn nav-btn-add" onclick="addFile()" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
 
+					</div>
 
+					<div id="addFile_attachment" style="display: none" class="upload-progress">
 
+						<span id="fileName_attachment" ></span>
 
+						<b><span id="baifenbi_attachment" ></span></b>
 
+						<div class="progress">
 
+							<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
 
+							</div>
 
+						</div>
 
+					</div>
 
+					<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 
+					<span id="attachment_title"></span>
 
+					<div class="layui-item layui-col-xs12" style="padding:0 16px;">
 
+						<table id="listAttachment" class="table table-bordered table-condensed details">
 
+							<thead>
 
+							<tr>
 
+								<th>文件预览</th>
 
+								<th>上传人</th>
 
+								<th>上传时间</th>
 
+								<th width="180px">操作</th>
 
+							</tr>
 
+							</thead>
 
+							<tbody id="file_attachment">
 
+							<c:forEach items="${workMaterialCollectType.workattachment}" var = "workClientAttachment" varStatus="status">
 
+								<tr>
 
+										<%-- <td>${status.index + 1}</td>--%>
 
+									<c:choose>
 
+										<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
 
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
 
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
 
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
 
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
 
+											<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
 
+										</c:when>
 
+										<c:otherwise>
 
+											<c:choose>
 
+												<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
 
+													<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
 
+												</c:when>
 
+												<c:otherwise>
 
+													<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>
 
+												</c:otherwise>
 
+											</c:choose>
 
+										</c:otherwise>
 
+									</c:choose>
 
+											<input type="hidden" value="${workClientAttachment.url}"  id="urlAtt">
 
+											<input type="hidden" value="${workClientAttachment.attachmentName}" id="nameAtt">
 
+									<td>${workClientAttachment.createBy.name}</td>
 
+									<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
 
+									<td class="op-td">
 
+										<div class="op-btn-box" >
 
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 
+											<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
 
+												<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
 
+											</c:if>
 
+										</div>
 
+									</td>
 
+								</tr>
 
+							</c:forEach>
 
+							</tbody>
 
+						</table>
 
+					</div>
 
+				</div>
 
+			</div>
 
+		</form:form>
 
+	</div>
 
+</div>
 
+</body>
 
+</html>

+ 134 - 0
src/main/webapp/webpage/modules/workmaterialcollect/modelCollect/workMaterialCollectModelList.jsp
Wyświetl plik 

@@ -0,0 +1,134 @@
 
+<%@ page contentType="text/html;charset=UTF-8" %>
 
+<%@ include file="/webpage/include/taglib.jsp"%>
 
+<html>
 
+<head>
 
+    <title>材料价格</title>
 
+    <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0,viewport-fit=cover">
 
+    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
 
+    <meta content="yes" name="apple-mobile-web-app-capable">
 
+    <meta content="black" name="apple-mobile-web-app-status-bar-style">
 
+    <meta content="telephone=no" name="format-detection">
 
+    <link rel="stylesheet" href="https://res.wx.qq.com/open/libs/weui/1.1.2/weui-for-work.min.css"/>
 
+    <script src="/static/jquery/jquery-2.1.1.min.js"></script>
 
+    <script src="/static/weixin/js/jquery-weui.min.js"></script>
 
+    <link rel="stylesheet" href="/static/weixin/css/jquery-weui.min.css"/>
 
+    <link rel="stylesheet" href="${ctx}/static/weixin/example/example.css"/>
 
+    <link rel="stylesheet" href="/static/wechat/wechat-btn.css"/>
 
+</head>
 
+<style>
 
+    .model_fex{
 
+     width: 12%;
 
+    }
 
+
 
+</style>
 
+<script>
 
+    $(function () {
 
+        // loadlistProject();
 
+        loadlist();
 
+    })
 
+    function loadlist() {
 
+        var html = "";
 
+        $.ajax({
 
+            type: "POST",
 
+            url: "/workMaterialCollect/total/list.do",
 
+            // data: { 'page': pages, 'size': sizes },
 
+            dataType: "json",
 
+            success: function (data) {
 
+                // alert(data);
 
+                if (data.length > 0) {
 
+                    html +='<div class="weui-flex" style="background-color: #f9f9f9">\n' +
 
+                        '            <div class="weui-flex__item model_fex">名称</div>\n' +
 
+                        '            <div class="weui-flex__item">型号</div>\n' +
 
+                        '            <div class="weui-flex__item">单位</div>\n' +
 
+                        '            <div class="weui-flex__item">含税价</div>\n' +
 
+                        '            <div class="weui-flex__item">除税价</div>\n' +
 
+                        '            <div class="weui-flex__item">分析</div>\n' +
 
+                        '       </div>';
 
+                    for (var i = 0; i < data.length; i++) {
 
+                        // alert(data[i].id)
 
+                        // alert(data[i].materialName);
 
+                        html+="<div class='weui-flex' style=''>" +
 
+                            "<div class='weui-flex__item model_fex'>"+data[i].materialName+"</div>" +
 
+                            "<div class='weui-flex__item'>"+data[i].specifications+"</div>" +
 
+                            "<div class='weui-flex__item'>"+data[i].unit+"</div>" +
 
+                            "<div class='weui-flex__item'>/</div>" +
 
+                            "<div class='weui-flex__item'>"+data[i].excludingTax+"</div>" +
 
+                            "<div class='weui-flex__item'><a href='/workMaterialCollect/total/view?id="+data[i].id+"'>查看</a></div>" +
 
+                            "</div>";
 
+                        html+="<div class='weui-flex' style=''>" +
 
+                                "<div class='weui-flex__item model_fex' style='font-size: 5px'>" +
 
+                                "来源:<span>"+data[i].projectName+"</span>项目;分类:<span>"+data[i].projectType+"</span>;工程时间<span>"+data[i].startDate+"/"+data[i].endDate+"</span>" +
 
+                                "</div>" +
 
+                            "</div>";
 
+                    }
 
+                    $("#toList").append(html);
 
+                }
 
+            }
 
+        });
 
+    }
 
+    function loadlistProject() {
 
+        var html = "";
 
+        $.ajax({
 
+            type: "POST",
 
+            url: "/workMaterialCollect/total/project.list.do",
 
+            // data: { 'page': pages, 'size': sizes },
 
+            dataType: "json",
 
+            success: function (data) {
 
+                if (data.length > 0) {
 
+                    html +='<div class="weui-flex" style="background-color: ">\n' +
 
+                        '            <div class="weui-flex__item">项目名称</div>\n' +
 
+                        '            <div class="weui-flex__item">地区</div>\n' +
 
+                        '            <div class="weui-flex__item">分类</div>\n' +
 
+                        '            <div class="weui-flex__item">工程时间</div>\n' +
 
+                        '            <div class="weui-flex__item">详情</div>\n' +
 
+                        '        </div>';
 
+                    for (var k = 0; k < data.length; k++) {
 
+                        for (var i = 0; i < data[k].workMaterialCollectTypes.length; i++) {
 
+                            // alert(data[i].id)
 
+                            // alert(data[i].materialName);
 
+                            html+=" <div class='weui-cell'>" +
 
+                                "<div class='weui-flex' style=''>" +
 
+                                "<div class='weui-flex__item'>"+data[k].projectName+"</div>" +
 
+                                "<div class='weui-flex__item'>"+data[k].projectSite+"</div>" +
 
+                                "<div class='weui-flex__item'>"+data[k].workMaterialCollectTypes[i].projectType+"</div>" +
 
+                                "<div class='weui-flex__item'>/</div>" +
 
+                                "<div class='weui-flex__item'><a href='/workMaterialCollect/total/project.view?itemId="+data[k].id+"&projectTypeId="+data[k].workMaterialCollectTypes[i].id+"'>查看</a></div>" +
 
+                                "</div>" +
 
+                                "</div>";
 
+                        }
 
+                    }
 
+                    $("#toList").append(html);
 
+                }
 
+            }
 
+        });
 
+    }
 
+</script>
 
+<body>
 
+<div style="padding: 2px">
 
+    <div class="weui-flex">
 
+        <div class="weui-flex__item">测试布局</div>
 
+        <div class="weui-flex__item">测试布局</div>
 
+    </div>
 
+    <div class='weui-cells' id="toList">
 
+
 
+    </div>
 
+</div>
 
+
 
+</body>
 
+<script type="text/javascript">
 
+    $("#in").select({
 
+        title: "选择类型",
 
+        multi: true,
 
+        items: [
 
+            {
 
+                title: "项目",
 
+                value: 1
 
+            },
 
+            {
 
+                title: "材料",
 
+                value: 2
 
+            },
 
+        ]
 
+    });
 
+</script>
 
+</html>

+ 63 - 0
src/main/webapp/webpage/modules/workmaterialcollect/modelCollect/workMaterialCollectModelProjectView.jsp
Wyświetl plik 

@@ -0,0 +1,63 @@
 
+<%@ page contentType="text/html;charset=UTF-8" %>
 
+<%@ include file="/webpage/include/taglib.jsp"%>
 
+<html>
 
+<head>
 
+    <title>材料价格</title>
 
+    <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0,viewport-fit=cover">
 
+    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
 
+    <meta content="yes" name="apple-mobile-web-app-capable">
 
+    <meta content="black" name="apple-mobile-web-app-status-bar-style">
 
+    <meta content="telephone=no" name="format-detection">
 
+    <link rel="stylesheet" href="https://res.wx.qq.com/open/libs/weui/1.1.2/weui-for-work.min.css"/>
 
+    <script src="/static/jquery/jquery-2.1.1.min.js"></script>
 
+    <script src="/static/weixin/js/jquery-weui.min.js"></script>
 
+    <link rel="stylesheet" href="/static/weixin/css/jquery-weui.min.css"/>
 
+    <link rel="stylesheet" href="${ctx}/static/weixin/example/example.css"/>
 
+    <link rel="stylesheet" href="/static/wechat/wechat-btn.css"/>
 
+</head>
 
+<style>
 
+</style>
 
+<script>
 
+</script>
 
+<body>
 
+<div class='weui-cells'>
 
+    <div class="weui-flex" style="background-color: #999999">
 
+        <div class="weui-flex__item">项目</div>
 
+        <div class="weui-flex__item">地区</div>
 
+        <div class="weui-flex__item">分类</div>
 
+        <div class="weui-flex__item">时间</div>
 
+    </div>
 
+    <div class="weui-flex" style="">
 
+        <div class="weui-flex__item">${workEng.projectName}</div>
 
+        <div class="weui-flex__item">${workEng.projectSite}</div>
 
+        <div class="weui-flex__item">${workType.projectType}</div>
 
+        <div class="weui-flex__item">${workEng.projectStartDate}/${workEng.projectEndDate}</div>
 
+    </div>
 
+</div>
 
+<div class='weui-cells'>
 
+    <div class="weui-flex" style="background-color: #999999">
 
+        <div class="weui-flex__item">名称</div>
 
+        <div class="weui-flex__item">型号</div>
 
+        <div class="weui-flex__item">单位</div>
 
+        <div class="weui-flex__item">含税价</div>
 
+        <div class="weui-flex__item">除税价</div>
 
+        <div class="weui-flex__item">分析</div>
 
+    </div>
 
+    <c:forEach items="${workTotal}" var="w">
 
+        <div class="weui-flex" style="">
 
+            <div class="weui-flex__item">${w.materialName}</div>
 
+            <div class="weui-flex__item">${w.specifications}</div>
 
+            <div class="weui-flex__item">${w.unit}</div>
 
+            <div class="weui-flex__item">/</div>
 
+            <div class="weui-flex__item">${w.excludingTax}</div>
 
+            <div class="weui-flex__item"><a href="/workMaterialCollect/total/project.view.do?id=${w.id}&itemId=${itemId}">查看</a></div>
 
+        </div>
 
+    </c:forEach>
 
+</div>
 
+
 
+
 
+</body>
 
+<script type="text/javascript">
 
+
 
+</script>
 
+</html>

+ 54 - 0
src/main/webapp/webpage/modules/workmaterialcollect/modelCollect/workMaterialCollectModelView.jsp
Wyświetl plik 

@@ -0,0 +1,54 @@
 
+<%@ page contentType="text/html;charset=UTF-8" %>
 
+<%@ include file="/webpage/include/taglib.jsp"%>
 
+<html>
 
+<head>
 
+    <title>材料价格</title>
 
+    <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0,viewport-fit=cover">
 
+    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
 
+    <meta content="yes" name="apple-mobile-web-app-capable">
 
+    <meta content="black" name="apple-mobile-web-app-status-bar-style">
 
+    <meta content="telephone=no" name="format-detection">
 
+    <link rel="stylesheet" href="https://res.wx.qq.com/open/libs/weui/1.1.2/weui-for-work.min.css"/>
 
+    <script src="/static/jquery/jquery-2.1.1.min.js"></script>
 
+    <script src="/static/weixin/js/jquery-weui.min.js"></script>
 
+    <link rel="stylesheet" href="/static/weixin/css/jquery-weui.min.css"/>
 
+    <link rel="stylesheet" href="${ctx}/static/weixin/example/example.css"/>
 
+    <link rel="stylesheet" href="/static/wechat/wechat-btn.css"/>
 
+</head>
 
+<style>
 
+</style>
 
+<script>
 
+</script>
 
+<body>
 
+<div class='weui-cells'>
 
+    <div class="weui-flex" style="background-color: #999999">
 
+        <div class="weui-flex__item">名称</div>
 
+        <div class="weui-flex__item">型号</div>
 
+        <div class="weui-flex__item">单位</div>
 
+    </div>
 
+    <div class="weui-flex" style="">
 
+        <div class="weui-flex__item">${workCollect.materialName}</div>
 
+        <div class="weui-flex__item">${workCollect.specifications}</div>
 
+        <div class="weui-flex__item">${workCollect.unit}</div>
 
+    </div>
 
+</div>
 
+
 
+<div class='weui-cells'>
 
+    <div class="weui-flex" style="background-color: #999999">
 
+        <div class="weui-flex__item">最高除税价</div>
 
+        <div class="weui-flex__item">最低除税价</div>
 
+        <div class="weui-flex__item">平均价</div>
 
+    </div>
 
+    <div class="weui-flex" style="">
 
+        <div class="weui-flex__item">${taxMax}</div>
 
+        <div class="weui-flex__item">${taxMin}</div>
 
+        <div class="weui-flex__item">${taxAvg}</div>
 
+    </div>
 
+</div>
 
+
 
+
 
+</body>
 
+<script type="text/javascript">
 
+
 
+</script>
 
+</html>

+ 388 - 0
src/main/webapp/webpage/modules/workmaterialcollect/workMaterialCollectEngineerForm.jsp
Wyświetl plik 

@@ -0,0 +1,388 @@
 
+<%@ page contentType="text/html;charset=UTF-8" %>
 
+<%@ include file="/webpage/include/taglib.jsp"%>
 
+<html>
 
+<head>
 
+	<title>确认单采集编辑</title>
 
+	<meta name="decorator" content="default"/>
 
+	<script type="text/javascript">
 
+
 
+        var validateForm;
 
+        validateForm = $("#inputForm").validate({
 
+            rules:{
 
+                // leader:{
 
+                //     leader:true
 
+                // },
 
+                // officeName:{
 
+                //     officeName:true
 
+                // },
 
+                // projectName:{
 
+                //     projectName:true
 
+                // },
 
+                // beginDate:{
 
+                //     beginDate:true
 
+                // },
 
+                // endDate:{
 
+                //     endDate:true
 
+                // },
 
+                // projectSite:{
 
+                //     projectSite:true
 
+                // }
 
+            },
 
+            messages:{
 
+            },
 
+            submitHandler: function(form){
 
+                loading('正在提交，请稍等...');
 
+                form.submit();
 
+            },
 
+            errorContainer: "#messageBox",
 
+            errorPlacement: function(error, element) {
 
+                $("#messageBox").text("输入有误，请先更正。");
 
+                if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
 
+                    error.appendTo(element.parent().parent());
 
+                } else {
 
+                    error.insertAfter(element);
 
+                }
 
+            }
 
+        });
 
+        var count = 0;
 
+        $(document).ready(function() {
 
+            laydate.render({
 
+                elem: '#beginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
 
+                format: 'yyyy-MM-dd',
 
+                type : 'date'
 
+            });
 
+
 
+            laydate.render({
 
+                elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
 
+                format: 'yyyy-MM-dd',
 
+                type : 'date'
 
+            });
 
+
 
+            checkContentKeyUp('collarFor',255);
 
+            if($("#collarDate").val()==null || $("#collarDate").val()==''){
 
+                $("#collarDate").val(getNowFormatDate());
 
+            }
 
+        });
 
+        function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 
+            // var idArr = $("#workItemCollarCatalogList tr:visible");
 
+            // if(idArr.length<1){
 
+            //     parent.layer.msg("请上传材料价格采集文件!", {icon: 5});
 
+            //     return false;
 
+            // }
 
+            // if(validateForm.form()){
 
+            //     alert(1);
 
+            //     return true;
 
+            // }else {
 
+            //      parent.layer.msg("信息未填写完整!", {icon: 5});
 
+            // }
 
+            if(obj == 2){
 
+                $("#inputForm").attr("action","${ctx}/workMaterialCollect/engineer/store");
 
+            }else{
 
+                $("#inputForm").attr("action","${ctx}/workMaterialCollect/engineer/save");
 
+            }
 
+            $("#inputForm").submit();
 
+            return true;
 
+        }
 
+
 
+        function deleteRow(obj,index){
 
+            $(obj).parent().parent().remove();
 
+            str[index] = " ";
 
+            mon[index] = 0;
 
+
 
+        }
 
+        function getNowFormatDate() {
 
+            var date = new Date();
 
+            var seperator1 = "-";
 
+            var seperator2 = ":";
 
+            var month = date.getMonth() + 1;
 
+            var strDate = date.getDate();
 
+            month = (month < 10)?"0"+month:month;
 
+            strDate = (strDate < 10)?"0"+strDate:strDate;
 
+            var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate;
 
+            return currentdate;
 
+        }
 
+
 
+        function addRow(list, idx, tpl, row){
 
+            var idx1 = $("#workItemCollarCatalogList tr").length;
 
+            //tpl = tpl.replace("workMonthlyPlanThisList[0]_workClientInfoId","workMonthlyPlanThisList["+idx1+"].workClientInfoId");
 
+
 
+            bornTemplete(list, idx, tpl, row, idx1);
 
+        }
 
+        function bornTemplete(list, idx, tpl, row, idx1){
 
+            $(list).append(Mustache.render(tpl, {
 
+                idx: idx, delBtn: true, row: row,
 
+                order:idx1 + 1
 
+            }));
 
+            $(list+idx).find("select").each(function(){
 
+                $(this).val($(this).attr("data-value"));
 
+            });
 
+            $(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
 
+                var ss = $(this).attr("data-value").split(',');
 
+                for (var i=0; i<ss.length; i++){
 
+                    if($(this).val() == ss[i]){
 
+                        $(this).attr("checked","checked");
 
+                    }
 
+                }
 
+            });
 
+
 
+        }
 
+        function delRow(obj, prefix,url){
 
+            <%--deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=null&type=2','addFile_attachment','_attachment');--%>
 
+            $(obj).parent().parent().remove();
 
+            // var id = $(prefix+"_id");
 
+            //     var delFlag = $(prefix+"_delFlag");
 
+            //     if (id.val() == ""){
 
+            //         delFlag.val("1");
 
+			//
 
+            //     }else if(delFlag.val() == "0"){
 
+            //         delFlag.val("1");
 
+            //         $(obj).html("&divide;").attr("title", "撤销删除");
 
+            //         $(obj).parent().parent().addClass("error");
 
+            //         $(obj).parent().parent().addClass("hide");
 
+            //     }else if(delFlag.val() == "1"){
 
+            //         delFlag.val("0");
 
+            //         $(obj).html("&times;").attr("title", "删除");
 
+            //         $(obj).parent().parent().removeClass("error");
 
+            //     }
 
+        }
 
+
 
+
 
+        function isNumber(val){
 
+            if(val === "" || val ==null){
 
+                return false;
 
+            }
 
+            var regPos = /^\d+(\.\d+)?$/; //非负浮点数
 
+            var regNeg = /^(-(([0-9]+\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\.[0-9]+)|([0-9]*[1-9][0-9]*)))$/; //负浮点数
 
+            if(regPos.test(val) || regNeg.test(val)){
 
+                return true;
 
+            }else{
 
+                return false;
 
+            }
 
+
 
+        }
 
+        function setCatalogInfo(data){
 
+            for(var i=0;i<data.length;i++){
 
+                // var idArr = $("#workMaterialCollectEngineer tr:visible .workCatalogueItemId");
 
+                addRow('#workMaterialCollectEngineer', workItemCollarCatalogListRowIdx, workItemCollarCatalogListTpl);
 
+                workItemCollarCatalogListRowIdx = workItemCollarCatalogListRowIdx + 1;
 
+                var row = workItemCollarCatalogListRowIdx - 1 ;
 
+                // $("#"+"workMaterialCollectTypes"+row+"_workCatalogueItemid").val(data[i].id);
 
+                $("#"+"workMaterialCollectTypes"+row+"_1").val(data[i].projectType);
 
+                $("#"+"workMaterialCollectTypes"+row+"_2").val(data[i].projectPart);
 
+                $("#"+"workMaterialCollectTypes"+row+"_3").val(data[i].attachmentName);
 
+                $("#"+"workMaterialCollectTypes"+row+"_4").val(data[i].url);
 
+			}
 
+        }
 
+        function hasInArr(id,idArr) {
 
+            for(var i=0;i<idArr.length;i++){
 
+                if(id==$(idArr[i]).val()){
 
+                    return true;
 
+                }
 
+            }
 
+            return false;
 
+        }
 
+        // function setAssetsInfo(d){
 
+        //     addRow('#workMaterialCollectEngineer', workItemCollarItemListRowIdx, workItemCollarItemListTpl);workItemCollarItemListRowIdx = workItemCollarItemListRowIdx + 1;
 
+        //     var row = workItemCollarItemListRowIdx - 1 ;
 
+        //     $("#"+"workMaterialCollectTypes"+row+"_workAssetsId").val(d.id);
 
+        //     $("#"+"workMaterialCollectTypes"+row+"_1").val(d.number);
 
+        //     $("#"+"workMaterialCollectTypes"+row+"_2").val(d.itemName);
 
+        //     $("#"+"workMaterialCollectTypes"+row+"_3").val(d.itemNumber);
 
+        //     // $("#"+"workItemCollarItemList"+row+"_6").val(d.primaryUnit);
 
+        // }
 
+
 
+	</script>
 
+	<style>
 
+		/*超过5个汉字，调整label的长度，以下是配套的*/
 
+		.layui-item .layui-form-label{
 
+			width:90px;
 
+		}
 
+		.form-group .layui-item .layui-input-block,
 
+		.query .layui-input-block {
 
+			margin-left: 116px;
 
+		}
 
+	</style>
 
+</head>
 
+<body>
 
+<div class="single-form">
 
+	<div class="container">
 
+		<form:form id="inputForm" modelAttribute="workMaterialCollectEngineer" action="${ctx}/workMaterialCollect/engineer/save" method="post" class="form-horizontal" >
 
+			<form:hidden path="id"/>
 
+			<div class="form-group layui-row first">
 
+				<div class="form-group-label"><h2>基础信息</h2></div>
 
+				<div class="layui-item layui-col-sm6">
 
+					<label class="layui-form-label"><span class="require-item">*</span>采集人：</label>
 
+					<div class="layui-input-block">
 
+						<form:input id="leader" path="userName" readonly="true" htmlEscape="false" class="form-control required  layui-input"/>
 
+					</div>
 
+				</div>
 
+				<div class="layui-item layui-col-sm6">
 
+					<label class="layui-form-label"><span class="require-item">*</span>采集部门：</label>
 
+					<div class="layui-input-block">
 
+						<form:input id="officeName" readonly="true" path="officeName" htmlEscape="false" class="form-control required layui-input "/>
 
+					</div>
 
+				</div>
 
+				<div class="layui-item layui-col-sm6">
 
+					<label class="layui-form-label"><span class="require-item">*</span>工程名称：</label>
 
+					<div class="layui-input-block">
 
+						<form:input id="projectName" path="projectName" name = "projectName" htmlEscape="false" class="form-control required layui-input"/>
 
+					</div>
 
+				</div>
 
+				<div class="layui-item layui-col-sm6">
 
+					<label class="layui-form-label"><span class="require-item">*</span>工程日期：</label>
 
+					<div class="layui-input-block">
 
+						<input id="beginDate" placeholder="开始时间" name="projectStartDate" htmlEscape="false" type="text" readonly  maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group required"
 
+							   value="<fmt:formatDate value="${workMaterialCollectEngineer.projectStartDate}" pattern="yyyy-MM-dd"/>"/>
 
+						</input>
 
+						<span class="group-sep">-</span>
 
+						<input id="endDate" placeholder="结束时间" name="projectEndDate" htmlEscape="false" type="text" readonly  maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group required"
 
+							   value="<fmt:formatDate value="${workMaterialCollectEngineer.projectEndDate}" pattern="yyyy-MM-dd"/>"/>
 
+						</input>
 
+					</div>
 
+				</div>
 
+				<div class="layui-item layui-col-sm6">
 
+					<label class="layui-form-label"><span class="require-item">*</span>工作地点：</label>
 
+					<div class="layui-input-block with-icon">
 
+						<sys:treeselect id="projectSite" name="projectSite" value="${workMaterialCollectEngineer.projectSite}" labelName="projectSite"
 
+										labelValue="${workMaterialCollectEngineer.projectSite}"
 
+										title="区域" url="/sys/area/treeData" cssClass="form-control required layui-input"
 
+										allowClear="true" notAllowSelectParent="false"/>
 
+					</div>
 
+				</div>
 
+			</div>
 
+
 
+			<div class="form-group layui-row">
 
+				<div class="form-group-label"><h2>材料价格采集</h2></div>
 
+				<div class="layui-item nav-btns">
 
+					<sys:gridselectCataWork url="${ctx}//workMaterialCollect/type/selectCataWork" id="contentData" title="选择工程类型"
 
+										fieldLabels="" fieldKeys=""  searchLabel="" searchKey="name"></sys:gridselectCataWork>
 
+
 
+				</div>
 
+				<div class="layui-item layui-col-xs12 form-table-container" >
 
+					<table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin">
 
+						<thead>
 
+						<tr>
 
+							<th width="200px">工程类型</th>
 
+							<th width="200px">工程部位</th>
 
+							<th width="200px">采集文件名称</th>
 
+							<%--<th width="200px">文件路径</th>--%>
 
+							<th width="200px">编辑</th>
 
+						</tr>
 
+						</thead>
 
+						<tbody id="workMaterialCollectEngineer">
 
+						<c:if test="${not empty workMaterialCollectEngineer.workMaterialCollectTypes}">
 
+							<c:forEach items="${workMaterialCollectEngineer.workMaterialCollectTypes}" var="workMaterialCollectType" varStatus="index">
 
+								<tr id="workItemCollarCatalogList${index.index}">
 
+									<td class="hide">
 
+										<input id="workMaterialCollectTypes${index.index}_id" name="workMaterialCollectTypes[${index.index}].id" type="hidden" value="${workMaterialCollectType.id}"/>
 
+									</td>
 
+									<td>
 
+										<input id="workMaterialCollectTypes${index.index}_1"  readonly="true"   name="workMaterialCollectTypes[${index.index}].projectType" type="text" value="${workMaterialCollectType.projectType}"   class="form-control "/>
 
+									</td>
 
+									<td>
 
+										<input id="workMaterialCollectTypes${index.index}_2"  readonly="true"   name="workMaterialCollectTypes[${index.index}].projectPart" type="text" value="${workMaterialCollectType.projectPart}"   class="form-control "/>
 
+									</td>
 
+									<td>
 
+										<input id="workMaterialCollectTypes${index.index}_3" readonly="true" name="workMaterialCollectTypes[${index.index}].workattachment.attachmentName" value="${workMaterialCollectType.workattachment.attachmentName}" class="form-control "/>
 
+									</td>
 
+										<%--<c:choose>--%>
 
+											<%--<c:when test="${fn:containsIgnoreCase(workMaterialCollectType.workClientAttachment.attachmentName,'jpg')--%>
 
+                                                           <%--or fn:containsIgnoreCase(workMaterialCollectType.workClientAttachment.attachmentName,'png')--%>
 
+                                                           <%--or fn:containsIgnoreCase(workMaterialCollectType.workClientAttachment.attachmentName,'gif')--%>
 
+                                                           <%--or fn:containsIgnoreCase(workMaterialCollectType.workClientAttachment.attachmentName,'bmp')--%>
 
+                                                           <%--or fn:containsIgnoreCase(workMaterialCollectType.workClientAttachment.attachmentName,'jpeg')}">--%>
 
+												<%--<td><img src="${workMaterialCollectType.workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workMaterialCollectType.workClientAttachment.url}','90%','90%')" alt="${workMaterialCollectType.workClientAttachment.attachmentName}">--%>
 
+											<%--</c:when>--%>
 
+											<%--<c:otherwise>--%>
 
+												<%--<c:choose>--%>
 
+													<%--<c:when test="${fn:containsIgnoreCase(workMaterialCollectType.workClientAttachment.attachmentName,'pdf')}">--%>
 
+														<%--<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workMaterialCollectType.workClientAttachment.url}','90%','90%','1')">${workMaterialCollectType.workClientAttachment.attachmentName}</a></td>--%>
 
+													<%--</c:when>--%>
 
+													<%--<c:otherwise>--%>
 
+														<%--<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workMaterialCollectType.workClientAttachment.url}','90%','90%')">${workMaterialCollectType.workClientAttachment.attachmentName}</a></td>--%>
 
+													<%--</c:otherwise>--%>
 
+												<%--</c:choose>--%>
 
+											<%--</c:otherwise>--%>
 
+										<%--</c:choose>--%>
 
+										<td class="hide">
 
+											<input id="workMaterialCollectTypes${index.index}_4" readonly="true" name="workMaterialCollectTypes[${index.index}].workattachment.url" value="${workMaterialCollectType.workattachment.url}" class="form-control "/>
 
+										</td>
 
+									<td class="text-center op-td" >
 
+										<span class="op-btn op-btn-delete" id="workMaterialCollectTypes${index.index}_span" onclick="delRow(this, '#workItemCollarCatalogList${index.index}','${workMaterialCollectType.workattachment.url}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>
 
+									</td>
 
+								</tr>
 
+							</c:forEach>
 
+						</c:if>
 
+						</tbody>
 
+					</table>
 
+					<script type="text/template" id="workItemCollarCatalogListTpl">//<!--
 
+                                    <tr id="workItemCollarCatalogList{{idx}}">
 
+                                        <td>
 
+                                            <input id="workMaterialCollectTypes{{idx}}_1"   name="workMaterialCollectTypes[{{idx}}].projectType" type="text" value="{{row.workMaterialCollectType.projectType}}"  readonly="true"   class="form-control "/>
 
+                                        </td>
 
+                                        <td>
 
+                                            <input id="workMaterialCollectTypes{{idx}}_2"  name="workMaterialCollectTypes[{{idx}}].projectPart" type="text" value="{{row.workMaterialCollectType.projectPart}}"   readonly="true"  class="form-control "/>
 
+                                        </td>
 
+                                        <td>
 
+											<input id="workMaterialCollectTypes{{idx}}_3" name="workMaterialCollectTypes[{{idx}}].workattachment.attachmentName" type="text" value="{{row.workMaterialCollectType.workattachment.attachmentName}}"   readonly="true"  class="form-control "/>
 
+										</td>
 
+                                        <td class="hide">
 
+											<input id="workMaterialCollectTypes{{idx}}_4" name="workMaterialCollectTypes[{{idx}}].workattachment.url" type="text" value="{{row.workMaterialCollectType.workattachment.url}}"   readonly="true"  class="form-control "/>
 
+										</td>
 
+                                        <td class="text-center op-td" >
 
+                                            {{#delBtn}}<span class="op-btn op-btn-delete" id="workMaterialCollectTypes{{idx}}_span" onclick="delRow(this, '#workItemCollarCatalogList{{idx}}','{{row.workMaterialCollectType.workattachment.url}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}
 
+                                        </td>
 
+                                    </tr>//-->
 
+					</script>
 
+					<script type="text/javascript">
 
+                        var workItemCollarCatalogListRowIdx = ${fn:length(workItemCollar.workItemCollarCatalogList)}, workItemCollarCatalogListTpl = $("#workItemCollarCatalogListTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 
+                        if($("#id").val()){
 
+                            workItemCollarCatalogListIdx = ${fn:length(workItemCollar.workItemCollarCatalogList)};
 
+                        }
 
+                        $(document).ready(function() {
 
+                        });
 
+					</script>
 
+				</div>
 
+			</div>
 
+			<div class="form-group layui-row page-end"></div>
 
+		</form:form>
 
+	</div>
 
+</div>
 
+</body>
 
+<script>
 
+    function openDialog(title,url,width,height,target) {
 
+        if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
 
+            width = 'auto';
 
+            height = 'auto';
 
+        } else {//如果是PC端，根据用户设置的width和height显示。
 
+        }
 
+        top.layer.open({
 
+            type: 2,
 
+            area: [width, height],
 
+            title: title,
 
+            maxmin: true, //开启最大化最小化按钮
 
+            content: url,
 
+            skin: 'three-btns',
 
+            btn: ['确定', '关闭'],
 
+            btn1: function(index, layero){
 
+                var body = top.layer.getChildFrame('body', index);
 
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
 
+                var inputForm = body.find('#inputForm');
 
+                var top_iframe;
 
+                if(target){
 
+                    top_iframe = target;//如果指定了iframe，则在改frame中跳转
 
+                }else{
 
+                    top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
 
+                }
 
+                inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
 
+                if(iframeWin.contentWindow.doSubmit(1) ){
 
+                    // top.layer.close(index);//关闭对话框。
 
+                    setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
 
+                }
 
+            },
 
+            btn2: function (index) {
 
+            }
 
+        });
 
+    }
 
+</script>
 
+</html>

+ 273 - 0
src/main/webapp/webpage/modules/workmaterialcollect/workMaterialCollectEngineerList.jsp
Wyświetl plik 

@@ -0,0 +1,273 @@
 
+<%@ page import="com.jeeplus.modules.sys.utils.UserUtils" %>
 
+<%@ page contentType="text/html;charset=UTF-8" %>
 
+<%@ include file="/webpage/include/taglib.jsp"%>
 
+<html>
 
+<head>
 
+	<title>确认单采集列表</title>
 
+	<meta name="decorator" content="default"/>
 
+	<style>
 
+		.widthClass{
 
+			display: inline-block;
 
+		}
 
+		.shows .input-group{
 
+			width: 48%!important;
 
+		}
 
+	</style>
 
+	<style>
 
+		body{
 
+			background-color:transparent;
 
+			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
 
+			color:#ffffff;
 
+			background-color:rgba(255,255,255,0);
 
+			height:100%;
 
+		}
 
+	</style>
 
+</head>
 
+<body>
 
+<div class="wrapper wrapper-content">
 
+	<sys:message content="${message}"/>
 
+	<div class="layui-row">
 
+		<div class="full-width fl">
 
+			<div class="contentShadow layui-row" id="queryDiv">
 
+				<form:form id="searchForm" modelAttribute="workMaterialCollectEngineer" action="${ctx}/workMaterialCollect/engineer/" method="post" class="form-inline">
 
+					<%--以下三行照抄--%>
 
+					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 
+					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 
+					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
+					<div class="commonQuery">
 
+						<div class="layui-item query athird">
 
+							<label class="layui-form-label">工程名称：</label>
 
+							<div class="layui-input-block">
 
+								<input id="projectName" name="projectName" type="text"  maxlength="64" class=" form-control  layui-input laydate-icon" value="${workMaterialCollectEngineer.projectName}" />
 
+								</input>
 
+							</div>
 
+						</div>
 
+						<div class="layui-item query athird">
 
+							<label class="layui-form-label">工程地点：</label>
 
+							<div class="layui-input-block">
 
+								<input id="projectSite" name="projectSite" type="text"  maxlength="64" class=" form-control  layui-input laydate-icon" value="${workMaterialCollectEngineer.projectSite}" />
 
+								</input>
 
+							</div>
 
+						</div>
 
+						<div class="layui-item athird">
 
+							<div class="input-group">
 
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
 
+								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
 
+								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
 
+							</div>
 
+						</div>
 
+						<div style="clear:both;"></div>
 
+					</div>
 
+					<div id="moresees" style="clear:both;display:none;">
 
+						<div class="layui-item query athird">
 
+							<label class="layui-form-label">领用日期：</label>
 
+							<div class="layui-input-block">
 
+								<input id="beginDate" placeholder="开始时间" name="projectStatusDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 
+									   value="<fmt:formatDate value="${workMaterialCollectEngineer.projectStartDate}" pattern="yyyy-MM-dd"/>"/>
 
+								</input>
 
+								<span class="group-sep">-</span>
 
+								<input id="endDate" placeholder="结束时间" name="projectEndDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 
+									   value="<fmt:formatDate value="${workMaterialCollectEngineer.projectEndDate}" pattern="yyyy-MM-dd"/>"/>
 
+								</input>
 
+							</div>
 
+						</div>
 
+						<div style="clear:both;"></div>
 
+					</div>
 
+				</form:form>
 
+			</div>
 
+		</div>
 
+
 
+		<div class="full-width fl">
 
+			<div class="contentShadow layui-form contentDetails">
 
+				<div class="nav-btns">
 
+					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
 
+					<shiro:hasPermission name="workMaterialCollect:engineer:add">
 
+						<a href="javascript:void(0)" onclick="openDialog('新增材料价格采集信息', '${ctx}/workMaterialCollect/engineer/form?tabId=1','95%','95%')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i>&nbsp;添加</a>
 
+					</shiro:hasPermission>
 
+					<%--<shiro:hasPermission name="workitemcollar:workItemCollar:export">
 
+						<table:exportExcel url="${ctx}/workitemcollar/workItemCollar/export"></table:exportExcel><!-- 导出按钮 -->
 
+					</shiro:hasPermission>--%>
 
+						<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
 
+					<div style="clear: both;"></div>
 
+				</div>
 
+				<table class="oa-table layui-table" id="contentTable"></table>
 
+
 
+				<!-- 分页代码 -->
 
+				<table:page page="${page}"></table:page>
 
+				<div style="clear: both;"></div>
 
+			</div>
 
+		</div>
 
+	</div>
 
+	<div id="changewidth"></div>
 
+</div>
 
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 
+<script>
 
+    layui.use('table', function(){
 
+        layui.table.render({
 
+            limit:${ page.pageSize }
 
+            ,elem: '#contentTable'
 
+            ,page: false
 
+            ,cols: [[
 
+                {field:'projectName',align:'center', width:150,title: '工程名称', templet:function(d){
 
+                        var xml = "";
 
+						<%--<shiro:hasPermission name="workMaterialCollect:engineer:view">--%>
 
+                        xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看确认单采集', '${ctx}/workMaterialCollect/engineer/view?id=" + d.id + "','95%','95%')\">" +
 
+                            "<span title=" + d.projectName + ">" + d.projectName + "</span></a>";
 
+                        <%--</shiro:hasPermission>--%>
 
+                        return xml;
 
+                    }},
 
+                {field:'projectSite', align:'center',width:150,title: '工程地点'},
 
+                {field:'projectDate', align:'center',width:150,title: '工程日期'},
 
+                {align:'center',width:150,title: '状态',templet:function(d){
 
+                    	// alert(d.projectStatus)
 
+                        // var st = getWorkEng(d.projectStatus);
 
+                        // var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 
+                        var xml = "";
 
+						if (d.projectStatus != undefined && d.projectStatus == "1") {
 
+                            xml = "<span>已确认</span>"
 
+						}else {
 
+                            xml = "<span style='color:red;'>未确认</span>"
 
+						}
 
+                        return xml;
 
+                    }},
 
+               	{align:'caozuo',align:'center',title:"操作",templet:function(d){
 
+                        var xml = "";
 
+						<%--<shiro:hasPermission name="workMaterialCollect:engineer:edit">--%>
 
+                        xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改材料价格采集单', '${ctx}/workMaterialCollect/engineer/form?id=" + d.id+"','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i>修改</a>"
 
+                        xml +="<a href=\"${ctx}/workMaterialCollect/engineer/delete?id=" + d.id+"\" onclick=\"return confirmx('确认删除材料价格采集单吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
 
+                        return xml;
 
+                    }}
 
+            ]]
 
+            ,data: [
 
+                <c:if test="${ not empty page.list}">
 
+                <c:forEach items="${page.list}" var="workMaterialCollectEngineer" varStatus="index">
 
+                <c:if test="${index.index != 0}">,</c:if>
 
+                {
 
+                    "id":"${workMaterialCollectEngineer.id}"
 
+                    ,"projectName":"${workMaterialCollectEngineer.projectName}"
 
+                    ,"projectSite":"${workMaterialCollectEngineer.projectSite}"
 
+                    ,"projectDate":"<fmt:formatDate value="${workMaterialCollectEngineer.projectStartDate}" pattern="yyyy-MM-dd"/>"+"/"+"<fmt:formatDate value="${workMaterialCollectEngineer.projectEndDate}" pattern="yyyy-MM-dd"/>"
 
+                    ,"projectStatus":"${workMaterialCollectEngineer.projectStatus}"
 
+                }
 
+                </c:forEach>
 
+                </c:if>
 
+            ]
 
+        });
 
+
 
+    })
 
+    resizeListTable();
 
+</script>
 
+<script>
 
+    resizeListWindow1();
 
+    $(window).resize(function(){
 
+        resizeListWindow1();
 
+    });
 
+</script>
 
+<script type="text/javascript">
 
+    $(document).ready(function() {
 
+        $("#cus_name").show();
 
+        $("#cus_name").siblings().hide();
 
+        //搜索框收放
 
+        $('#moresee').click(function(){
 
+            if($('#moresees').is(':visible'))
 
+            {
 
+                $('#moresees').slideUp(0,resizeListWindow1);
 
+                $('#moresee i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
 
+            }else{
 
+                $('#moresees').slideDown(0,resizeListWindow1);
 
+                $('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
 
+            }
 
+        });
 
+
 
+        laydate.render({
 
+            elem: '#beginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
 
+            format: 'yyyy-MM-dd',
 
+            type : 'date'
 
+        });
 
+
 
+        laydate.render({
 
+            elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
 
+            format: 'yyyy-MM-dd',
 
+            type : 'date'
 
+        });
 
+
 
+    });
 
+    function switchInput(obj){
 
+        $("#"+obj).show();
 
+        $("#"+obj).siblings().hide();
 
+    }
 
+
 
+    function openDialogremodify(title,url,width,height,target){
 
+
 
+        if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
 
+            width='auto';
 
+            height='auto';
 
+        }else{//如果是PC端，根据用户设置的width和height显示。
 
+
 
+        }
 
+        top.layer.open({
 
+            type: 2,
 
+            area: [width, height],
 
+            title: title,
 
+            skin: 'two-btns',
 
+            maxmin: true, //开启最大化最小化按钮
 
+            content: url ,
 
+            btn: ['重新申请','关闭'],
 
+            yes: function(index, layero){
 
+                var body = top.layer.getChildFrame('body', index);
 
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
 
+                var inputForm = body.find('#inputForm');
 
+                var top_iframe;
 
+                if(target){
 
+                    top_iframe = target;//如果指定了iframe，则在改frame中跳转
 
+                }else{
 
+                    top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
 
+                }
 
+                inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
 
+
 
+                if(iframeWin.contentWindow.doSubmit() ){
 
+                    top.layer.close(index);//关闭对话框。
 
+                    //setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
 
+                }
 
+
 
+            }
 
+
 
+        });
 
+    }
 
+    function openDialog(title,url,width,height,target) {
 
+        if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
 
+            width = 'auto';
 
+            height = 'auto';
 
+        } else {//如果是PC端，根据用户设置的width和height显示。
 
+        }
 
+        top.layer.open({
 
+            type: 2,
 
+            area: [width, height],
 
+            title: title,
 
+            maxmin: true, //开启最大化最小化按钮
 
+            content: url,
 
+            skin: 'three-btns',
 
+            btn: ['确定', '关闭'],
 
+            btn1: function(index, layero){
 
+                var body = top.layer.getChildFrame('body', index);
 
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
 
+                var inputForm = body.find('#inputForm');
 
+                var top_iframe;
 
+                if(target){
 
+                    top_iframe = target;//如果指定了iframe，则在改frame中跳转
 
+                }else{
 
+                    top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
 
+                }
 
+                inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
 
+                if(iframeWin.contentWindow.doSubmit(1) ){
 
+                    // top.layer.close(index);//关闭对话框。
 
+                    setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
 
+                }
 
+            },
 
+            btn2: function (index) {
 
+            }
 
+        });
 
+    }
 
+</script>
 
+</body>
 
+</html>

+ 276 - 0
src/main/webapp/webpage/modules/workmaterialcollect/workMaterialCollectEngineerSureForm.jsp
Wyświetl plik 

@@ -0,0 +1,276 @@
 
+<%@ page contentType="text/html;charset=UTF-8" %>
 
+<%@ include file="/webpage/include/taglib.jsp"%>
 
+<html>
 
+<head>
 
+	<title>确认单采集编辑</title>
 
+	<meta http-equiv=Content-Type content=“text/html;charset=utf-8″>
 
+	<meta name="decorator" content="default"/>
 
+	<script type="text/javascript">
 
+        $(document).ready(function() {
 
+            laydate.render({
 
+                elem: '#beginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
 
+                format: 'yyyy-MM-dd',
 
+                type : 'date'
 
+            });
 
+
 
+            laydate.render({
 
+                elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
 
+                format: 'yyyy-MM-dd',
 
+                type : 'date'
 
+            });
 
+        });
 
+        function deleteForm(typeId,id) {
 
+            var itemId = $("#itemId").val();
 
+            top.layer.confirm("确认要取消上传后的确认单？", {icon: 3, title:'系统提示'}, function(index){
 
+                //do something
 
+                if (typeof href == 'function') {
 
+                    <%--${ctx}//workMaterialCollect/engineerSure/delete--%>
 
+                    // href();
 
+                }else{
 
+						$.ajax({
 
+							url : '${ctx}/workMaterialCollect/engineerSure/delete',
 
+							type : "post",
 
+							data : {"id":typeId,"itemId":itemId},
 
+							success : function(data) {
 
+							    $("#"+id).val("未上传");
 
+                                $("#"+id).attr("style","color:red");
 
+								parent.layer.msg(data.msg, {icon: 1});
 
+							},
 
+							error : function(arg1, arg2, arg3) {
 
+                                parent.layer.msg(data.msg, {icon: 1});
 
+							}
 
+                    });
 
+                }
 
+                top.layer.close(index);
 
+            });
 
+        }
 
+
 
+        function projectText(id,status){
 
+            var itemId = $("#itemId").val();
 
+            layer.prompt({title: '备注'},function(val, index){
 
+                $.post("${ctx}/workMaterialCollect/engineerSure/updateRemarks",{"id":id,"remarks":val},function(data){
 
+                    if(data.success){
 
+                        // jp.success(data.msg);
 
+						$("#"+status).val(val);
 
+                        parent.layer.msg(data.msg, {icon: 1});
 
+                        layer.close(index);
 
+                    }else{
 
+                        // jp.error(data.msg);
 
+                        parent.layer.msg(data.msg, {icon: 5});
 
+                        layer.close(index);
 
+                    }
 
+                })
 
+            });
 
+        }
 
+
 
+        function uploadFile(id,status,remarks){
 
+            var itemId = $("#itemId").val();
 
+            var text = $("#"+remarks).val();
 
+            $("#remarksId").val(text);
 
+            $("#itemHideId").val(itemId);
 
+            $("#projectTypeId").val(id);
 
+            top.layer.open({
 
+                type: 1,
 
+                area: [500, 300],
 
+                title:"上传确认单",
 
+                skin: 'three-btns with-demo',
 
+                content:$("#importBox").html() ,
 
+                btn: ['下载模板','确定', '关闭'],
 
+                btn1: function(index, layero){
 
+                    window.location.href='${ctx}/workMaterialCollect/total/import/template';
 
+                },
 
+                btn2: function(index, layero){
 
+                    <%--var formData = new FormData($("#importForm")[0]);--%>
 
+                    <%--var file = formData.get("file");--%>
 
+                    <%--alert(file);--%>
 
+                    <%--alert(formData);--%>
 
+                    <%--$.ajax({--%>
 
+                        <%--url : '${ctx}/workMaterialCollect/total/import1',--%>
 
+                        <%--type : "post",--%>
 
+                        <%--data : formData,--%>
 
+                        <%--traditional: true,--%>
 
+                        <%--cache: false,        // 不缓存数据--%>
 
+                        <%--processData: false,  // 不处理数据--%>
 
+                        <%--contentType: false,   // 不设置内容类型--%>
 
+                        <%--success : function() {--%>
 
+                            <%--parent.layer.msg("上传成功", {icon: 1});--%>
 
+                        <%--},--%>
 
+                        <%--error : function(arg1, arg2, arg3) {--%>
 
+                            <%--console.log(arg1 + "--" + arg2 + "--" + arg3);--%>
 
+                        <%--}--%>
 
+                    <%--});--%>
 
+                    var inputForm =top.$("#importForm");
 
+                    var top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
 
+                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
 
+					$("#"+status).val("已上传");
 
+                    $("#"+status).attr("style","color:black");
 
+                    top.$("#importForm").submit();
 
+                    parent.layer.msg("上传成功", {icon: 1});
 
+                },
 
+
 
+                btn3: function(index){
 
+                    top.layer.close(index);
 
+                }
 
+
 
+            });
 
+        }
 
+
 
+	</script>
 
+	<style>
 
+		/*超过5个汉字，调整label的长度，以下是配套的*/
 
+		.layui-item .layui-form-label{
 
+			width:90px;
 
+		}
 
+		.form-group .layui-item .layui-input-block,
 
+		.query .layui-input-block {
 
+			margin-left: 116px;
 
+		}
 
+	</style>
 
+</head>
 
+<body>
 
+<div id="importBox" class="hide">
 
+	<%--<form id="importForm"style="padding-left:20px;text-align:center;" enctype="multipart/form-data"><br/>--%>
 
+		<%--<input id="uploadFile"  value=""  type="file" name="file" style="width:330px"/>导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！<br/>　　--%>
 
+		<%--<div>--%>
 
+			<%--<input type="hidden" name ="itemHideId" id="itemHideId"/>--%>
 
+			<%--<input type="hidden"  name ="projectTypeId" id="projectTypeId"/>--%>
 
+			<%--<input type="hidden"  name ="remarks" id="remarksId"/>--%>
 
+		<%--</div>--%>
 
+	<%--</form>--%>
 
+	<form id="importForm" action="${ctx}/workMaterialCollect/total/import" method="post" style="padding-left:20px;text-align:center;" enctype="multipart/form-data"><br/>
 
+		<input id="uploadFile" name="file"  type="file" style="width:330px"/>导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！<br/>　　
 
+		<div>
 
+			<input type="hidden" name ="itemHideId" id="itemHideId"/>
 
+			<input type="hidden"  name ="projectTypeId" id="projectTypeId"/>
 
+			<input type="hidden"  name ="remarks" id="remarksId"/>
 
+		</div>
 
+	</form>
 
+</div>
 
+<div class="single-form">
 
+	<div class="container">
 
+		<form:form id="inputForm" modelAttribute="workMaterialCollectEngineer" action="" method="post" class="form-horizontal">
 
+			<form:hidden path="id" id="itemId"/>
 
+			<div class="form-group layui-row">
 
+				<div class="form-group-label"><h2>材料价格确认</h2></div>
 
+				<div class="layui-item layui-col-xs12 form-table-container" >
 
+					<table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin">
 
+						<thead>
 
+						<tr>
 
+							<th width="200px">工程类型</th>
 
+							<th width="200px">工程部位</th>
 
+							<th width="200px">采集文件名称</th>
 
+							<th width="100px">状态</th>
 
+							<th width="100px">备注</th>
 
+							<%--<th width="200px">文件路径</th>--%>
 
+							<th width="300px">编辑</th>
 
+						</tr>
 
+						</thead>
 
+						<tbody id="workMaterialCollectEngineer">
 
+						<c:if test="${not empty workMaterialCollectEngineer.workMaterialCollectTypes}">
 
+							<c:forEach items="${workMaterialCollectEngineer.workMaterialCollectTypes}" var="workMaterialCollectType" varStatus="index">
 
+								<tr id="workItemCollarCatalogList${index.index}">
 
+									<td class="hide">
 
+										<input id="workMaterialCollectTypes${index.index}_id" name="workMaterialCollectTypes[${index.index}].id" type="hidden" value="${workMaterialCollectType.id}"/>
 
+									</td>
 
+									<td style="text-align:center;vertical-align:middle;">
 
+										<a class="attention-info" href="javascript:void(0)" onclick="openDialogView('查看已上传的材料价格确认单', '${ctx}/workMaterialCollect/engineerSure/sureTotalView?projectTypeId=${workMaterialCollectType.id}','80%','80%')"><span title="${workMaterialCollectType.projectType}">${workMaterialCollectType.projectType}</span></a>
 
+										<%--<input id="workMaterialCollectTypes${index.index}_1"  readonly="true"   name="workMaterialCollectTypes[${index.index}].projectType" type="text" value="${workMaterialCollectType.projectType}"   class="form-control "/>--%>
 
+									</td>
 
+									<td>
 
+										<input id="workMaterialCollectTypes${index.index}_2" readonly="true"   name="workMaterialCollectTypes[${index.index}].projectPart" type="text" value="${workMaterialCollectType.projectPart}"   class="form-control "/>
 
+									</td>
 
+										<td>
 
+											<input id="workMaterialCollectTypes${index.index}_3" readonly="true" name="workMaterialCollectTypes[${index.index}].workattachment.attachmentName" value="${workMaterialCollectType.workattachment.attachmentName}" class="form-control "/>
 
+										</td>
 
+										<td>
 
+											<input id="workMaterialCollectTypes${index.index}_4" readonly="true" name="workMaterialCollectTypes[${index.index}].status" value="${workMaterialCollectType.status}" class="form-control "/>
 
+										</td>
 
+										<td>
 
+											<input id="workMaterialCollectTypes${index.index}_6" readonly="true" name="workMaterialCollectTypes[${index.index}].remarks" value="${workMaterialCollectType.remarks}" class="form-control "/>
 
+										</td>
 
+										<td class="hide">
 
+											<input id="workMaterialCollectTypes${index.index}_5" readonly="true" name="workMaterialCollectTypes[${index.index}].workattachment.url" value="${workMaterialCollectType.workattachment.url}" class="form-control "/>
 
+										</td>
 
+									<td class="text-center op-td" >
 
+										<a href="${workMaterialCollectType.workattachment.url}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 
+										<a href="javascript:void(0)" class="op-btn op-btn-add" title="上传" onclick="uploadFile('${workMaterialCollectType.id}','workMaterialCollectTypes${index.index}_4','workMaterialCollectTypes${index.index}_6')"><i class="fa fa-plus"></i> 上传</a>
 
+										<a href="javascript:void(0)" class="op-btn  op-btn-edit" title="备注" onclick="projectText('${workMaterialCollectType.id}','workMaterialCollectTypes${index.index}_6')"><i class="fa fa-edit"></i> 备注</a>
 
+										<a href="javascript:void(0)" onclick="deleteForm('${workMaterialCollectType.id}','workMaterialCollectTypes${index.index}_4')" class="op-btn op-btn-delete"><i class="fa fa-trash"></i>取消</a>
 
+									</td>
 
+								</tr>
 
+							</c:forEach>
 
+						</c:if>
 
+						</tbody>
 
+					</table>
 
+					<script type="text/template" id="workItemCollarCatalogListTpl">//<!--
 
+                                    <tr id="workItemCollarCatalogList{{idx}}">
 
+                                        <td>
 
+                                            <input id="workMaterialCollectTypes{{idx}}_1"   name="workMaterialCollectTypes[{{idx}}].projectType" type="text" value="{{row.workMaterialCollectType.projectType}}"  readonly="true"   class="form-control "/>
 
+                                        </td>
 
+                                        <td>
 
+                                            <input id="workMaterialCollectTypes{{idx}}_2"  name="workMaterialCollectTypes[{{idx}}].projectPart" type="text" value="{{row.workMaterialCollectType.projectPart}}"   readonly="true"  class="form-control "/>
 
+                                        </td>
 
+                                        <td>
 
+											<input id="workMaterialCollectTypes{{idx}}_3" name="workMaterialCollectTypes[{{idx}}].workattachment.attachmentName" type="text" value="{{row.workMaterialCollectType.workattachment.attachmentName}}"   readonly="true"  class="form-control "/>
 
+										</td>
 
+                                        <td >
 
+											<input id="workMaterialCollectTypes{{idx}}_4" name="workMaterialCollectTypes[{{idx}}].workattachment.url" type="text" value="{{row.workMaterialCollectType.workattachment.url}}"   readonly="true"  class="form-control "/>
 
+										</td>
 
+                                        <td class="text-center op-td" >
 
+                                            {{#delBtn}}<span class="op-btn op-btn-delete" id="workMaterialCollectTypes{{idx}}_span" onclick="delRow(this, '#workItemCollarCatalogList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}
 
+                                        </td>
 
+                                    </tr>//-->
 
+					</script>
 
+					<script type="text/javascript">
 
+                        var workItemCollarCatalogListRowIdx = ${fn:length(workItemCollar.workItemCollarCatalogList)}, workItemCollarCatalogListTpl = $("#workItemCollarCatalogListTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 
+                        if($("#id").val()){
 
+                            workItemCollarCatalogListIdx = ${fn:length(workItemCollar.workItemCollarCatalogList)};
 
+                        }
 
+                        $(document).ready(function() {
 
+                        });
 
+					</script>
 
+				</div>
 
+			</div>
 
+			<div class="form-group layui-row page-end"></div>
 
+		</form:form>
 
+	</div>
 
+</div>
 
+</body>
 
+<script>
 
+    function openDialog(title,url,width,height,target) {
 
+        if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
 
+            width = 'auto';
 
+            height = 'auto';
 
+        } else {//如果是PC端，根据用户设置的width和height显示。
 
+        }
 
+        top.layer.open({
 
+            type: 2,
 
+            area: [width, height],
 
+            title: title,
 
+            maxmin: true, //开启最大化最小化按钮
 
+            content: url,
 
+            skin: 'three-btns',
 
+            btn: ['确定', '关闭'],
 
+            btn1: function(index, layero){
 
+                var body = top.layer.getChildFrame('body', index);
 
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
 
+                var inputForm = body.find('#inputForm');
 
+                var top_iframe;
 
+                if(target){
 
+                    top_iframe = target;//如果指定了iframe，则在改frame中跳转
 
+                }else{
 
+                    top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
 
+                }
 
+                inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
 
+                if(iframeWin.contentWindow.doSubmit(1) ){
 
+                    // top.layer.close(index);//关闭对话框。
 
+                    setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
 
+                }
 
+            },
 
+            btn2: function (index) {
 
+            }
 
+        });
 
+    }
 
+
 
+</script>
 
+</html>

+ 275 - 0
src/main/webapp/webpage/modules/workmaterialcollect/workMaterialCollectEngineerSureList.jsp
Wyświetl plik 

@@ -0,0 +1,275 @@
 
+<%@ page import="com.jeeplus.modules.sys.utils.UserUtils" %>
 
+<%@ page contentType="text/html;charset=UTF-8" %>
 
+<%@ include file="/webpage/include/taglib.jsp"%>
 
+<html>
 
+<head>
 
+	<title>确认单采集列表</title>
 
+	<meta name="decorator" content="default"/>
 
+	<style>
 
+		.widthClass{
 
+			display: inline-block;
 
+		}
 
+		.shows .input-group{
 
+			width: 48%!important;
 
+		}
 
+	</style>
 
+	<style>
 
+		body{
 
+			background-color:transparent;
 
+			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
 
+			color:#ffffff;
 
+			background-color:rgba(255,255,255,0);
 
+			height:100%;
 
+		}
 
+	</style>
 
+</head>
 
+<body>
 
+<div class="wrapper wrapper-content">
 
+	<sys:message content="${message}"/>
 
+	<div class="layui-row">
 
+		<div class="full-width fl">
 
+			<div class="contentShadow layui-row" id="queryDiv">
 
+				<form:form id="searchForm" modelAttribute="workMaterialCollectEngineer" action="${ctx}/workMaterialCollect/engineerSure/" method="post" class="form-inline">
 
+					<%--以下三行照抄--%>
 
+					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 
+					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 
+					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
+					<div class="commonQuery">
 
+						<div class="layui-item query athird">
 
+							<label class="layui-form-label">工程名称：</label>
 
+							<div class="layui-input-block">
 
+								<input id="projectName" name="projectName" type="text"  maxlength="64" class=" form-control  layui-input laydate-icon" value="${workMaterialCollectEngineer.projectName}" />
 
+								</input>
 
+							</div>
 
+						</div>
 
+						<div class="layui-item query athird">
 
+							<label class="layui-form-label">状态：</label>
 
+							<div class="layui-input-block">
 
+								<select id="businessType" name="projectStatus" class="form-control simple-select">
 
+									<option value="" selected="selected"></option>
 
+									<option value="0">未确认</option><option value="1">已确认</option></option>
 
+								</select>
 
+							</div>
 
+						</div>
 
+
 
+						<div class="layui-item athird">
 
+							<div class="input-group">
 
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
 
+								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
 
+								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
 
+							</div>
 
+						</div>
 
+						<div style="clear:both;"></div>
 
+					</div>
 
+					<div id="moresees" style="clear:both;display:none;">
 
+						<div class="layui-item query athird">
 
+							<label class="layui-form-label">工程地点：</label>
 
+							<div class="layui-input-block">
 
+								<input id="projectSite" name="projectSite" type="text"  maxlength="64" class=" form-control  layui-input laydate-icon" value="${workMaterialCollectEngineer.projectSite}" />
 
+								</input>
 
+							</div>
 
+						</div>
 
+						<div class="layui-item query athird">
 
+							<label class="layui-form-label">领用日期：</label>
 
+							<div class="layui-input-block">
 
+								<input id="beginDate" placeholder="开始时间" name="projectStatusDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 
+									   value="<fmt:formatDate value="${workMaterialCollectEngineer.projectStartDate}" pattern="yyyy-MM-dd"/>"/>
 
+								</input>
 
+								<span class="group-sep">-</span>
 
+								<input id="endDate" placeholder="结束时间" name="projectEndDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 
+									   value="<fmt:formatDate value="${workMaterialCollectEngineer.projectEndDate}" pattern="yyyy-MM-dd"/>"/>
 
+								</input>
 
+							</div>
 
+						</div>
 
+
 
+						<div style="clear:both;"></div>
 
+					</div>
 
+				</form:form>
 
+			</div>
 
+		</div>
 
+
 
+		<div class="full-width fl">
 
+			<div class="contentShadow layui-form contentDetails">
 
+				<div class="nav-btns">
 
+					<%--<table:importExcelEng url="${ctx}/workclientinfo/workClientInfo/import"></table:importExcelEng>--%>
 
+
 
+					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
 
+					<div style="clear: both;"></div>
 
+				</div>
 
+				<table class="oa-table layui-table" id="contentTable"></table>
 
+
 
+				<!-- 分页代码 -->
 
+				<table:page page="${page}"></table:page>
 
+				<div style="clear: both;"></div>
 
+			</div>
 
+		</div>
 
+	</div>
 
+	<div id="changewidth"></div>
 
+</div>
 
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 
+<script>
 
+    layui.use('table', function(){
 
+        layui.table.render({
 
+            limit:${ page.pageSize }
 
+            ,elem: '#contentTable'
 
+            ,page: false
 
+            ,cols: [[
 
+                {field:'projectName',align:'center', width:150,title: '工程名称', templet:function(d){
 
+                        var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看确认单采集', '${ctx}/workMaterialCollect/engineerSure/form?id=" + d.id + "','95%','95%')\">" +
 
+                            "<span title=" + d.projectName + ">" + d.projectName + "</span></a>";
 
+                        return xml;
 
+                    }},
 
+                {field:'projectSite', align:'center',width:150,title: '工程地点'},
 
+                {field:'projectDate', align:'center',width:150,title: '工程日期'},
 
+                {align:'center',width:150,title: '状态',templet:function(d){
 
+                    	// alert(d.projectStatus)
 
+                        // var st = getWorkEng(d.projectStatus);
 
+                        // var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 
+                        var xml = "";
 
+						if (d.projectStatus != undefined && d.projectStatus == "1") {
 
+                            xml = "<span>已上传</span>"
 
+						}else {
 
+                            xml = "<span style='color: red'>未上传</span>"
 
+						}
 
+                        return xml;
 
+                    }},
 
+               	{align:'caozuo',align:'center',title:"操作",templet:function(d){
 
+                        var xml = "";
 
+                        xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogView('确认单整理详情', '${ctx}/workMaterialCollect/engineerSure/form?id=" + d.id+"','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i>编辑</a>"
 
+						<%--xml +="<a href=\"${ctx}//workMaterialCollect/engineerSure/delete?id=" + d.id+"\" onclick=\"return confirmx('确认要取消上传后的确认单？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 取消</a>";--%>
 
+                        return xml;
 
+                    }}
 
+            ]]
 
+            ,data: [
 
+                <c:if test="${ not empty page.list}">
 
+                <c:forEach items="${page.list}" var="workMaterialCollectEngineer" varStatus="index">
 
+                <c:if test="${index.index != 0}">,</c:if>
 
+                {
 
+                    "id":"${workMaterialCollectEngineer.id}"
 
+                    ,"projectName":"${workMaterialCollectEngineer.projectName}"
 
+                    ,"projectSite":"${workMaterialCollectEngineer.projectSite}"
 
+                    ,"projectDate":"<fmt:formatDate value="${workMaterialCollectEngineer.projectStartDate}" pattern="yyyy-MM-dd"/>"+"/"+"<fmt:formatDate value="${workMaterialCollectEngineer.projectEndDate}" pattern="yyyy-MM-dd"/>"
 
+                    ,"projectStatus":"${workMaterialCollectEngineer.projectStatus}"
 
+                }
 
+                </c:forEach>
 
+                </c:if>
 
+            ]
 
+        });
 
+
 
+    })
 
+    resizeListTable();
 
+</script>
 
+<script>
 
+    resizeListWindow1();
 
+    $(window).resize(function(){
 
+        resizeListWindow1();
 
+    });
 
+</script>
 
+<script type="text/javascript">
 
+    $(document).ready(function() {
 
+        $("#cus_name").show();
 
+        $("#cus_name").siblings().hide();
 
+        //搜索框收放
 
+        $('#moresee').click(function(){
 
+            if($('#moresees').is(':visible'))
 
+            {
 
+                $('#moresees').slideUp(0,resizeListWindow1);
 
+                $('#moresee i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
 
+            }else{
 
+                $('#moresees').slideDown(0,resizeListWindow1);
 
+                $('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
 
+            }
 
+        });
 
+
 
+        laydate.render({
 
+            elem: '#beginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
 
+            format: 'yyyy-MM-dd',
 
+            type : 'date'
 
+        });
 
+
 
+        laydate.render({
 
+            elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
 
+            format: 'yyyy-MM-dd',
 
+            type : 'date'
 
+        });
 
+
 
+    });
 
+    function switchInput(obj){
 
+        $("#"+obj).show();
 
+        $("#"+obj).siblings().hide();
 
+    }
 
+
 
+    function openDialogremodify(title,url,width,height,target){
 
+
 
+        if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
 
+            width='auto';
 
+            height='auto';
 
+        }else{//如果是PC端，根据用户设置的width和height显示。
 
+
 
+        }
 
+        top.layer.open({
 
+            type: 2,
 
+            area: [width, height],
 
+            title: title,
 
+            skin: 'two-btns',
 
+            maxmin: true, //开启最大化最小化按钮
 
+            content: url ,
 
+            btn: ['重新申请','关闭'],
 
+            yes: function(index, layero){
 
+                var body = top.layer.getChildFrame('body', index);
 
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
 
+                var inputForm = body.find('#inputForm');
 
+                var top_iframe;
 
+                if(target){
 
+                    top_iframe = target;//如果指定了iframe，则在改frame中跳转
 
+                }else{
 
+                    top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
 
+                }
 
+                inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
 
+
 
+                if(iframeWin.contentWindow.doSubmit() ){
 
+                    top.layer.close(index);//关闭对话框。
 
+                    //setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
 
+                }
 
+
 
+            }
 
+
 
+        });
 
+    }
 
+    function openDialog(title,url,width,height,target) {
 
+        if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
 
+            width = 'auto';
 
+            height = 'auto';
 
+        } else {//如果是PC端，根据用户设置的width和height显示。
 
+        }
 
+        top.layer.open({
 
+            type: 2,
 
+            area: [width, height],
 
+            title: title,
 
+            maxmin: true, //开启最大化最小化按钮
 
+            content: url,
 
+            skin: 'three-btns',
 
+            btn: ['确定', '关闭'],
 
+            btn1: function(index, layero){
 
+                var body = top.layer.getChildFrame('body', index);
 
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
 
+                var inputForm = body.find('#inputForm');
 
+                var top_iframe;
 
+                if(target){
 
+                    top_iframe = target;//如果指定了iframe，则在改frame中跳转
 
+                }else{
 
+                    top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
 
+                }
 
+                inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
 
+                if(iframeWin.contentWindow.doSubmit(1) ){
 
+                    // top.layer.close(index);//关闭对话框。
 
+                    setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
 
+                }
 
+            },
 
+            btn2: function (index) {
 
+            }
 
+        });
 
+    }
 
+</script>
 
+</body>
 
+</html>

+ 352 - 0
src/main/webapp/webpage/modules/workmaterialcollect/workMaterialCollectEngineerView.jsp
Wyświetl plik 

@@ -0,0 +1,352 @@
 
+<%@ page contentType="text/html;charset=UTF-8" %>
 
+<%@ include file="/webpage/include/taglib.jsp"%>
 
+<html>
 
+<head>
 
+	<title>确认单采集查看</title>
 
+	<meta name="decorator" content="default"/>
 
+	<script type="text/javascript">
 
+        var validateForm;
 
+        var count = 0;
 
+        $(document).ready(function() {
 
+            laydate.render({
 
+                elem: '#beginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
 
+                format: 'yyyy-MM-dd',
 
+                type : 'date'
 
+            });
 
+
 
+            laydate.render({
 
+                elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
 
+                format: 'yyyy-MM-dd',
 
+                type : 'date'
 
+            });
 
+
 
+            checkContentKeyUp('collarFor',255);
 
+            if($("#collarDate").val()==null || $("#collarDate").val()==''){
 
+                $("#collarDate").val(getNowFormatDate());
 
+            }
 
+            validateForm = $("#inputForm").validate({
 
+                submitHandler: function(form){
 
+                    loading('正在提交，请稍等...');
 
+                    form.submit();
 
+                },
 
+                rules:{
 
+                },
 
+                messages:{
 
+                },
 
+                errorContainer: "#messageBox",
 
+                errorPlacement: function(error, element) {
 
+                    $("#messageBox").text("输入有误，请先更正。");
 
+                    if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
 
+                        error.appendTo(element.parent().parent());
 
+                    } else {
 
+                        error.insertAfter(element);
 
+                    }
 
+                }
 
+            });
 
+        });
 
+        function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 
+            // var idArr = $("#workItemCollarCatalogList tr:visible");
 
+            // if(idArr.length<1){
 
+            //     parent.layer.msg("请添加物品申请明细!", {icon: 5});
 
+            //     return false;
 
+            // }
 
+			alert(1);
 
+			alert(obj);
 
+            if(obj == 2){
 
+                $("#inputForm").attr("action","${ctx}/workMaterialCollect/engineer/store");
 
+            }else{
 
+                $("#inputForm").attr("action","${ctx}/workMaterialCollect/engineer/save");
 
+            }
 
+            $("#inputForm").submit();
 
+            // if(validateForm.form()){
 
+            //     alert(1);
 
+            //
 
+            //     return true;
 
+            // }else {
 
+            //     parent.layer.msg("信息未填写完整!", {icon: 5});
 
+            // }
 
+
 
+            return true;
 
+        }
 
+
 
+        function deleteRow(obj,index){
 
+            $(obj).parent().parent().remove();
 
+            str[index] = " ";
 
+            mon[index] = 0;
 
+
 
+        }
 
+        function getNowFormatDate() {
 
+            var date = new Date();
 
+            var seperator1 = "-";
 
+            var seperator2 = ":";
 
+            var month = date.getMonth() + 1;
 
+            var strDate = date.getDate();
 
+            month = (month < 10)?"0"+month:month;
 
+            strDate = (strDate < 10)?"0"+strDate:strDate;
 
+            var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate;
 
+            return currentdate;
 
+        }
 
+
 
+        function addRow(list, idx, tpl, row){
 
+            var idx1 = $("#workItemCollarCatalogList tr").length;
 
+            //tpl = tpl.replace("workMonthlyPlanThisList[0]_workClientInfoId","workMonthlyPlanThisList["+idx1+"].workClientInfoId");
 
+
 
+            bornTemplete(list, idx, tpl, row, idx1);
 
+        }
 
+        function bornTemplete(list, idx, tpl, row, idx1){
 
+            $(list).append(Mustache.render(tpl, {
 
+                idx: idx, delBtn: true, row: row,
 
+                order:idx1 + 1
 
+            }));
 
+            $(list+idx).find("select").each(function(){
 
+                $(this).val($(this).attr("data-value"));
 
+            });
 
+            $(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
 
+                var ss = $(this).attr("data-value").split(',');
 
+                for (var i=0; i<ss.length; i++){
 
+                    if($(this).val() == ss[i]){
 
+                        $(this).attr("checked","checked");
 
+                    }
 
+                }
 
+            });
 
+
 
+        }
 
+        function delRow(obj, prefix){
 
+            $(obj).parent().parent().remove();
 
+            // var id = $(prefix+"_id");
 
+            //     var delFlag = $(prefix+"_delFlag");
 
+            //     if (id.val() == ""){
 
+            //         delFlag.val("1");
 
+            //
 
+            //     }else if(delFlag.val() == "0"){
 
+            //         delFlag.val("1");
 
+            //         $(obj).html("&divide;").attr("title", "撤销删除");
 
+            //         $(obj).parent().parent().addClass("error");
 
+            //         $(obj).parent().parent().addClass("hide");
 
+            //     }else if(delFlag.val() == "1"){
 
+            //         delFlag.val("0");
 
+            //         $(obj).html("&times;").attr("title", "删除");
 
+            //         $(obj).parent().parent().removeClass("error");
 
+            //     }
 
+        }
 
+
 
+
 
+        function isNumber(val){
 
+            if(val === "" || val ==null){
 
+                return false;
 
+            }
 
+            var regPos = /^\d+(\.\d+)?$/; //非负浮点数
 
+            var regNeg = /^(-(([0-9]+\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\.[0-9]+)|([0-9]*[1-9][0-9]*)))$/; //负浮点数
 
+            if(regPos.test(val) || regNeg.test(val)){
 
+                return true;
 
+            }else{
 
+                return false;
 
+            }
 
+
 
+        }
 
+        function setCatalogInfo(data){
 
+            for(var i=0;i<data.length;i++){
 
+                // var idArr = $("#workMaterialCollectEngineer tr:visible .workCatalogueItemId");
 
+                addRow('#workMaterialCollectEngineer', workItemCollarCatalogListRowIdx, workItemCollarCatalogListTpl);
 
+                workItemCollarCatalogListRowIdx = workItemCollarCatalogListRowIdx + 1;
 
+                var row = workItemCollarCatalogListRowIdx - 1 ;
 
+                // $("#"+"workMaterialCollectTypes"+row+"_workCatalogueItemid").val(data[i].id);
 
+                $("#"+"workMaterialCollectTypes"+row+"_1").val(data[i].projectType);
 
+                $("#"+"workMaterialCollectTypes"+row+"_2").val(data[i].projectPart);
 
+                $("#"+"workMaterialCollectTypes"+row+"_3").val(data[i].attachmentName);
 
+                $("#"+"workMaterialCollectTypes"+row+"_4").val(data[i].url);
 
+			}
 
+        }
 
+        function hasInArr(id,idArr) {
 
+            for(var i=0;i<idArr.length;i++){
 
+                if(id==$(idArr[i]).val()){
 
+                    return true;
 
+                }
 
+            }
 
+            return false;
 
+        }
 
+        // function setAssetsInfo(d){
 
+        //     addRow('#workMaterialCollectEngineer', workItemCollarItemListRowIdx, workItemCollarItemListTpl);workItemCollarItemListRowIdx = workItemCollarItemListRowIdx + 1;
 
+        //     var row = workItemCollarItemListRowIdx - 1 ;
 
+        //     $("#"+"workMaterialCollectTypes"+row+"_workAssetsId").val(d.id);
 
+        //     $("#"+"workMaterialCollectTypes"+row+"_1").val(d.number);
 
+        //     $("#"+"workMaterialCollectTypes"+row+"_2").val(d.itemName);
 
+        //     $("#"+"workMaterialCollectTypes"+row+"_3").val(d.itemNumber);
 
+        //     // $("#"+"workItemCollarItemList"+row+"_6").val(d.primaryUnit);
 
+        // }
 
+
 
+	</script>
 
+	<style>
 
+		/*超过5个汉字，调整label的长度，以下是配套的*/
 
+		.layui-item .layui-form-label{
 
+			width:90px;
 
+		}
 
+		.form-group .layui-item .layui-input-block,
 
+		.query .layui-input-block {
 
+			margin-left: 116px;
 
+		}
 
+	</style>
 
+</head>
 
+<body>
 
+<div class="single-form">
 
+	<div class="container">
 
+		<form:form id="inputForm" modelAttribute="workMaterialCollectEngineer" action="${ctx}/workMaterialCollect/engineer/save" method="post" class="form-horizontal" >
 
+			<form:hidden path="id"/>
 
+			<div class="form-group layui-row first">
 
+				<div class="form-group-label"><h2>基础信息</h2></div>
 
+				<div class="layui-item layui-col-sm6">
 
+					<label class="layui-form-label"><span class="require-item">*</span>采集人：</label>
 
+					<div class="layui-input-block">
 
+						<form:input id="leader" path="userName" readonly="true" htmlEscape="false" class="form-control  layui-input"/>
 
+					</div>
 
+				</div>
 
+				<div class="layui-item layui-col-sm6">
 
+					<label class="layui-form-label"><span class="require-item">*</span>采集部门：</label>
 
+					<div class="layui-input-block">
 
+						<form:input id="officeName" readonly="true" path="officeName"  htmlEscape="false" class="form-control   layui-input"/>
 
+					</div>
 
+				</div>
 
+				<div class="layui-item layui-col-sm6">
 
+					<label class="layui-form-label"><span class="require-item">*</span>工程名称：</label>
 
+					<div class="layui-input-block">
 
+						<form:input id="projectName" path="projectName" name = "projectName" readonly = "true" class="form-control   layui-input"/>
 
+					</div>
 
+				</div>
 
+				<div class="layui-item layui-col-sm6">
 
+					<label class="layui-form-label"><span class="require-item">*</span>领用日期：</label>
 
+					<div class="layui-input-block">
 
+						<input id="beginDate" placeholder="开始时间" name="projectStartDate" type="text" readonly maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 
+							   value="<fmt:formatDate value="${workMaterialCollectEngineer.projectStartDate}" pattern="yyyy-MM-dd"/>"/>
 
+						</input>
 
+						<span class="group-sep">-</span>
 
+						<input id="endDate" placeholder="结束时间" name="projectEndDate" type="text" readonly  maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 
+							   value="<fmt:formatDate value="${workMaterialCollectEngineer.projectEndDate}" pattern="yyyy-MM-dd"/>"/>
 
+						</input>
 
+					</div>
 
+				</div>
 
+				<div class="layui-item layui-col-sm6">
 
+					<label class="layui-form-label"><span class="require-item">*</span>工作地点：</label>
 
+					<div class="layui-input-block with-icon">
 
+						<sys:treeselect id="projectSite" name="projectSite" value="${workMaterialCollectEngineer.projectSite}" labelName="projectSite"
 
+										labelValue="${workMaterialCollectEngineer.projectSite}"
 
+										title="区域" url="/sys/area/treeData" cssClass="form-control required layui-input"
 
+										allowClear="true" notAllowSelectParent="false"/>
 
+					</div>
 
+				</div>
 
+			</div>
 
+
 
+			<div class="form-group layui-row">
 
+				<div class="form-group-label"><h2>材料价格采集</h2></div>
 
+				<%--<div class="layui-item nav-btns">--%>
 
+					<%--<sys:gridselectCataWork url="${ctx}//workMaterialCollect/type/selectCataWork" id="contentData" title="选择工程类型"--%>
 
+										<%--fieldLabels="" fieldKeys=""  searchLabel="" searchKey="name"></sys:gridselectCataWork>--%>
 
+
 
+				<%--</div>--%>
 
+				<div class="layui-item layui-col-xs12 form-table-container" >
 
+					<table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin">
 
+						<thead>
 
+						<tr>
 
+							<th width="200px">工程类型</th>
 
+							<th width="200px">工程部位</th>
 
+							<th width="200px">文件名称</th>
 
+							<%--<th width="200px">编辑</th>--%>
 
+						</tr>
 
+						</thead>
 
+						<tbody id="workMaterialCollectEngineer">
 
+						<c:if test="${not empty workMaterialCollectEngineer.workMaterialCollectTypes}">
 
+							<c:forEach items="${workMaterialCollectEngineer.workMaterialCollectTypes}" var="workMaterialCollectType" varStatus="index">
 
+								<tr id="workItemCollarCatalogList${index.index}">
 
+									<%--<td class="hide">--%>
 
+										<%--<input id="workMaterialCollectTypes${index.index}_id" name="workMaterialCollectTypes[${index.index}].id" type="hidden" value="${workMaterialCollectType.id}"/>--%>
 
+									<%--</td>--%>
 
+									<td>
 
+										<input id="workMaterialCollectTypes${index.index}_1"  readonly="true"   name="workMaterialCollectTypes[${index.index}].projectType" type="text" value="${workMaterialCollectType.projectType}"   class="form-control "/>
 
+									</td>
 
+									<td>
 
+										<input id="workMaterialCollectTypes${index.index}_2"  readonly="true"   name="workMaterialCollectTypes[${index.index}].projectPart" type="text" value="${workMaterialCollectType.projectPart}"   class="form-control "/>
 
+									</td>
 
+										<td>
 
+											<input id="workMaterialCollectTypes${index.index}_3" readonly="true" name="workMaterialCollectTypes[${index.index}].workattachment.attachmentName" value="${workMaterialCollectType.workattachment.attachmentName}" class="form-control "/>
 
+										</td>
 
+										<td class="hide">
 
+											<input id="workMaterialCollectTypes${index.index}_4" readonly="true" name="workMaterialCollectTypes[${index.index}].workattachment.url" value="${workMaterialCollectType.workattachment.url}" class="form-control "/>
 
+										</td>
 
+									<%--<td class="text-center op-td" >--%>
 
+										<%--<span class="op-btn op-btn-delete" id="workMaterialCollectTypes${index.index}_span" onclick="delRow(this, '#workItemCollarCatalogList${index.index}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>--%>
 
+									<%--</td>--%>
 
+								</tr>
 
+							</c:forEach>
 
+						</c:if>
 
+						</tbody>
 
+					</table>
 
+					<script type="text/template" id="workItemCollarCatalogListTpl">//<!--
 
+                                    <tr id="workItemCollarCatalogList{{idx}}">
 
+                                        <td>
 
+                                            <input id="workMaterialCollectTypes{{idx}}_1"   name="workMaterialCollectTypes[{{idx}}].projectType" type="text" value="{{row.workMaterialCollectType.projectType}}"  readonly="true"   class="form-control "/>
 
+                                        </td>
 
+                                        <td>
 
+                                            <input id="workMaterialCollectTypes{{idx}}_2"  name="workMaterialCollectTypes[{{idx}}].projectPart" type="text" value="{{row.workMaterialCollectType.projectPart}}"   readonly="true"  class="form-control "/>
 
+                                        </td>
 
+                                        <td>
 
+											<input id="workMaterialCollectTypes{{idx}}_3" name="workMaterialCollectTypes[{{idx}}].workattachment.attachmentName" type="text" value="{{row.workMaterialCollectType.workattachment.attachmentName}}"   readonly="true"  class="form-control "/>
 
+										</td>
 
+                                        <td>
 
+											<input id="workMaterialCollectTypes{{idx}}_4" name="workMaterialCollectTypes[{{idx}}].workattachment.url" type="text" value="{{row.workMaterialCollectType.workattachment.url}}"   readonly="true"  class="form-control "/>
 
+										</td>
 
+                                        <td class="text-center op-td" >
 
+                                            {{#delBtn}}<span class="op-btn op-btn-delete" id="workMaterialCollectTypes{{idx}}_span" onclick="delRow(this, '#workItemCollarCatalogList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}
 
+                                        </td>
 
+                                    </tr>//-->
 
+					</script>
 
+					<script type="text/javascript">
 
+                        var workItemCollarCatalogListRowIdx = ${fn:length(workItemCollar.workItemCollarCatalogList)}, workItemCollarCatalogListTpl = $("#workItemCollarCatalogListTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 
+                        if($("#id").val()){
 
+                            workItemCollarCatalogListIdx = ${fn:length(workItemCollar.workItemCollarCatalogList)};
 
+                        }
 
+                        $(document).ready(function() {
 
+                        });
 
+					</script>
 
+				</div>
 
+			</div>
 
+			<div class="form-group layui-row page-end"></div>
 
+		</form:form>
 
+	</div>
 
+</div>
 
+</body>
 
+<script>
 
+    function openDialog(title,url,width,height,target) {
 
+        if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
 
+            width = 'auto';
 
+            height = 'auto';
 
+        } else {//如果是PC端，根据用户设置的width和height显示。
 
+        }
 
+        top.layer.open({
 
+            type: 2,
 
+            area: [width, height],
 
+            title: title,
 
+            maxmin: true, //开启最大化最小化按钮
 
+            content: url,
 
+            skin: 'three-btns',
 
+            btn: ['确定', '关闭'],
 
+            btn1: function(index, layero){
 
+                var body = top.layer.getChildFrame('body', index);
 
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
 
+                var inputForm = body.find('#inputForm');
 
+                var top_iframe;
 
+                if(target){
 
+                    top_iframe = target;//如果指定了iframe，则在改frame中跳转
 
+                }else{
 
+                    top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
 
+                }
 
+                inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
 
+                if(iframeWin.contentWindow.doSubmit(1) ){
 
+                    // top.layer.close(index);//关闭对话框。
 
+                    setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
 
+                }
 
+            },
 
+            btn2: function (index) {
 
+            }
 
+        });
 
+    }
 
+</script>
 
+</html>

+ 274 - 0
src/main/webapp/webpage/modules/workmaterialcollect/workMaterialCollectTotalList.jsp
Wyświetl plik 

@@ -0,0 +1,274 @@
 
+<%@ page import="com.jeeplus.modules.sys.utils.UserUtils" %>
 
+<%@ page contentType="text/html;charset=UTF-8" %>
 
+<%@ include file="/webpage/include/taglib.jsp"%>
 
+<html>
 
+<head>
 
+	<title>材料价格确认单</title>
 
+	<meta name="decorator" content="default"/>
 
+	<style>
 
+		.widthClass{
 
+			display: inline-block;
 
+		}
 
+		.shows .input-group{
 
+			width: 48%!important;
 
+		}
 
+	</style>
 
+	<style>
 
+		body{
 
+			background-color:transparent;
 
+			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
 
+			color:#ffffff;
 
+			background-color:rgba(255,255,255,0);
 
+			height:100%;
 
+		}
 
+	</style>
 
+</head>
 
+<body>
 
+<div class="wrapper wrapper-content">
 
+	<sys:message content="${message}"/>
 
+	<div class="layui-row">
 
+		<div class="full-width fl">
 
+			<div class="contentShadow layui-row" id="queryDiv">
 
+				<form:form id="searchForm" modelAttribute="workMaterialCollectTotal" action="${ctx}/workMaterialCollect/total/" method="post" class="form-inline">
 
+					<%--以下三行照抄--%>
 
+					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 
+					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 
+					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
+					<div class="commonQuery">
 
+						<div class="layui-item query athird">
 
+							<label class="layui-form-label">材料名称：</label>
 
+							<div class="layui-input-block">
 
+								<input id="materialName" name="materialName" type="text"  maxlength="64" class=" form-control  layui-input laydate-icon" value="${workMaterialCollectEngineer.materialName}" />
 
+								</input>
 
+							</div>
 
+						</div>
 
+						<div class="layui-item query athird">
 
+							<label class="layui-form-label">工程类型：</label>
 
+							<div class="layui-input-block">
 
+                                <form:select id="projectType" path="projectType" onchange="changeProjectTypess(this.value);" class="form-control simple-select required">
 
+                                    <form:option value="" label=""/>
 
+                                    <form:options id="test" items="${fns:getDictList('work_material_engineer_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
 
+                                </form:select>
 
+							</div>
 
+						</div>
 
+						<div class="layui-item athird">
 
+							<div class="input-group">
 
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
 
+								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
 
+								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
 
+							</div>
 
+						</div>
 
+						<div id="moresees" style="clear:both;display:none;">
 
+							<div class="layui-item query athird">
 
+								<label class="layui-form-label">工程部位：</label>
 
+								<div class="layui-input-block">
 
+                                    <form:select path="projectPart" id="projectPart" onchange="changeTryEndTime(this.value);" class="form-control simple-select required">
 
+                                        <form:option value="" label=""/>
 
+                                        <form:options items="${fns:getDictList('work_material_engineer_part1')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
 
+                                    </form:select>
 
+								</div>
 
+							</div>
 
+							<div class="layui-item query athird">
 
+								<label class="layui-form-label">工程地点：</label>
 
+								<div class="layui-input-block">
 
+									<input id="projectSite" name="projectSite" type="text"  maxlength="64" class=" form-control  layui-input laydate-icon" value="${workMaterialCollectEngineer.projectSite}" />
 
+									</input>
 
+								</div>
 
+							</div>
 
+							<div class="layui-item query athird">
 
+								<label class="layui-form-label">项目名称：</label>
 
+								<div class="layui-input-block">
 
+									<input id="projectName" name="projectName" type="text"  maxlength="64" class=" form-control  layui-input laydate-icon" value="${workMaterialCollectEngineer.projectName}" />
 
+									</input>
 
+								</div>
 
+							</div>
 
+						</div>
 
+							<div style="clear:both;"></div>
 
+					</div>
 
+				</form:form>
 
+			</div>
 
+		</div>
 
+
 
+		<div class="full-width fl">
 
+			<div class="contentShadow layui-form contentDetails">
 
+				<div class="nav-btns">
 
+					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
 
+					<%--<shiro:hasPermission name="workitemcollar:workItemCollar:add">--%>
 
+						<%--<a href="javascript:void(0)" onclick="openDialog('新增领用', '${ctx}/workMaterialCollect/engineer/form?tabId=1','95%','95%')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i>&nbsp;添加</a>--%>
 
+					<%--</shiro:hasPermission>--%>
 
+					<shiro:hasPermission name="workMaterialCollect:total:export">
 
+						<table:exportExcel url="${ctx}/workMaterialCollect/total/export"></table:exportExcel><!-- 导出按钮 -->
 
+					</shiro:hasPermission>
 
+						<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
 
+					<div style="clear: both;"></div>
 
+				</div>
 
+				<table class="oa-table layui-table" id="contentTable"></table>
 
+
 
+				<!-- 分页代码 -->
 
+				<table:page page="${page}"></table:page>
 
+				<div style="clear: both;"></div>
 
+			</div>
 
+		</div>
 
+	</div>
 
+	<div id="changewidth"></div>
 
+</div>
 
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 
+<script>
 
+    layui.use('table', function(){
 
+        layui.table.render({
 
+            limit:${ page.pageSize }
 
+            ,elem: '#contentTable'
 
+            ,page: false
 
+            ,cols: [[
 
+                {field:'materialName', align:'center',width:150,title: '材料名称'},
 
+                {field:'specifications', align:'center',width:150,title: '规格'},
 
+                {field:'unit', align:'center',width:150,title: '单位'},
 
+                {field:'excludingTax', align:'center',width:150,title: '除税市场价'},
 
+                {field:'userTheParts', align:'center',width:150,title: '使用部位'},
 
+                {field:'projectDate', align:'center',width:150,title: '工程日期'},
 
+                {field:'projectType', align:'center',width:150,title: '工程类型'},
 
+                {field:'projectSite', align:'center',width:150,title: '工程地点'},
 
+                {field:'projectPart', align:'center',width:150,title: '工程部位'},
 
+                {field:'projectName', align:'center',width:150,title: '项目名称'},
 
+
 
+            ]]
 
+            ,data: [
 
+                <c:if test="${ not empty page.list}">
 
+                <c:forEach items="${page.list}" var="workMaterialCollectTotal" varStatus="index">
 
+                <c:if test="${index.index != 0}">,</c:if>
 
+                {
 
+                    "id":"${workMaterialCollectTotal.id}"
 
+                    ,"materialName":"${workMaterialCollectTotal.materialName}"
 
+                    ,"specifications":"${workMaterialCollectTotal.specifications}"
 
+                    ,"unit":"${workMaterialCollectTotal.unit}"
 
+                    ,"excludingTax":"${workMaterialCollectTotal.excludingTax}"
 
+                    ,"userTheParts":"${workMaterialCollectTotal.userTheParts}"
 
+                    ,"projectDate":"<fmt:formatDate value="${workMaterialCollectTotal.startDate}" pattern="yyyy-MM-dd"/>"+"/"+"<fmt:formatDate value="${workMaterialCollectTotal.endDate}" pattern="yyyy-MM-dd"/>"
 
+                    ,"projectType":"${workMaterialCollectTotal.projectType}"
 
+                    ,"projectSite":"${workMaterialCollectTotal.projectSite}"
 
+                    ,"projectPart":"${workMaterialCollectTotal.projectPart}"
 
+                    ,"projectName":"${workMaterialCollectTotal.projectName}"
 
+
 
+                }
 
+                </c:forEach>
 
+                </c:if>
 
+            ]
 
+        });
 
+
 
+    })
 
+    resizeListTable();
 
+</script>
 
+<script>
 
+    resizeListWindow1();
 
+    $(window).resize(function(){
 
+        resizeListWindow1();
 
+    });
 
+</script>
 
+<script type="text/javascript">
 
+    $(document).ready(function() {
 
+        $("#cus_name").show();
 
+        $("#cus_name").siblings().hide();
 
+        //搜索框收放
 
+        $('#moresee').click(function(){
 
+            if($('#moresees').is(':visible'))
 
+            {
 
+                $('#moresees').slideUp(0,resizeListWindow1);
 
+                $('#moresee i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
 
+            }else{
 
+                $('#moresees').slideDown(0,resizeListWindow1);
 
+                $('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
 
+            }
 
+        });
 
+
 
+        laydate.render({
 
+            elem: '#beginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
 
+            format: 'yyyy-MM-dd',
 
+            type : 'date'
 
+        });
 
+
 
+        laydate.render({
 
+            elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
 
+            format: 'yyyy-MM-dd',
 
+            type : 'date'
 
+        });
 
+
 
+    });
 
+    function switchInput(obj){
 
+        $("#"+obj).show();
 
+        $("#"+obj).siblings().hide();
 
+    }
 
+
 
+    function openDialogremodify(title,url,width,height,target){
 
+
 
+        if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
 
+            width='auto';
 
+            height='auto';
 
+        }else{//如果是PC端，根据用户设置的width和height显示。
 
+
 
+        }
 
+        top.layer.open({
 
+            type: 2,
 
+            area: [width, height],
 
+            title: title,
 
+            skin: 'two-btns',
 
+            maxmin: true, //开启最大化最小化按钮
 
+            content: url ,
 
+            btn: ['重新申请','关闭'],
 
+            yes: function(index, layero){
 
+                var body = top.layer.getChildFrame('body', index);
 
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
 
+                var inputForm = body.find('#inputForm');
 
+                var top_iframe;
 
+                if(target){
 
+                    top_iframe = target;//如果指定了iframe，则在改frame中跳转
 
+                }else{
 
+                    top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
 
+                }
 
+                inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
 
+
 
+                if(iframeWin.contentWindow.doSubmit() ){
 
+                    top.layer.close(index);//关闭对话框。
 
+                    //setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
 
+                }
 
+
 
+            }
 
+
 
+        });
 
+    }
 
+    function openDialog(title,url,width,height,target) {
 
+        if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
 
+            width = 'auto';
 
+            height = 'auto';
 
+        } else {//如果是PC端，根据用户设置的width和height显示。
 
+        }
 
+        top.layer.open({
 
+            type: 2,
 
+            area: [width, height],
 
+            title: title,
 
+            maxmin: true, //开启最大化最小化按钮
 
+            content: url,
 
+            skin: 'three-btns',
 
+            btn: ['确定', '关闭'],
 
+            btn1: function(index, layero){
 
+                var body = top.layer.getChildFrame('body', index);
 
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
 
+                var inputForm = body.find('#inputForm');
 
+                var top_iframe;
 
+                if(target){
 
+                    top_iframe = target;//如果指定了iframe，则在改frame中跳转
 
+                }else{
 
+                    top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
 
+                }
 
+                inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
 
+                if(iframeWin.contentWindow.doSubmit(1) ){
 
+                    // top.layer.close(index);//关闭对话框。
 
+                    setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
 
+                }
 
+            },
 
+            btn2: function (index) {
 
+            }
 
+        });
 
+    }
 
+</script>
 
+</body>
 
+</html>

+ 274 - 0
src/main/webapp/webpage/modules/workmaterialcollect/workMaterialCollectTotalSureView.jsp
Wyświetl plik 

@@ -0,0 +1,274 @@
 
+<%@ page import="com.jeeplus.modules.sys.utils.UserUtils" %>
 
+<%@ page contentType="text/html;charset=UTF-8" %>
 
+<%@ include file="/webpage/include/taglib.jsp"%>
 
+<html>
 
+<head>
 
+	<title>材料价格确认单</title>
 
+	<meta name="decorator" content="default"/>
 
+	<style>
 
+		.widthClass{
 
+			display: inline-block;
 
+		}
 
+		.shows .input-group{
 
+			width: 48%!important;
 
+		}
 
+	</style>
 
+	<style>
 
+		body{
 
+			background-color:transparent;
 
+			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
 
+			color:#ffffff;
 
+			background-color:rgba(255,255,255,0);
 
+			height:100%;
 
+		}
 
+	</style>
 
+</head>
 
+<body>
 
+<div class="wrapper wrapper-content">
 
+	<sys:message content="${message}"/>
 
+	<%--<div class="layui-row">--%>
 
+		<%--<div class="full-width fl">--%>
 
+			<%--<div class="contentShadow layui-row" id="queryDiv">--%>
 
+				<%--<form:form id="searchForm" modelAttribute="workMaterialCollectTotal" action="${ctx}/workMaterialCollect/total/" method="post" class="form-inline">--%>
 
+					<%--&lt;%&ndash;以下三行照抄&ndash;%&gt;--%>
 
+					<%--<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>--%>
 
+					<%--<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>--%>
 
+					<%--<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->--%>
 
+					<%--<div class="commonQuery">--%>
 
+						<%--<div class="layui-item query athird">--%>
 
+							<%--<label class="layui-form-label">材料名称：</label>--%>
 
+							<%--<div class="layui-input-block">--%>
 
+								<%--<input id="materialName" name="materialName" type="text"  maxlength="64" class=" form-control  layui-input laydate-icon" value="${workMaterialCollectEngineer.materialName}" />--%>
 
+								<%--</input>--%>
 
+							<%--</div>--%>
 
+						<%--</div>--%>
 
+						<%--<div class="layui-item query athird">--%>
 
+							<%--<label class="layui-form-label">工程类型：</label>--%>
 
+							<%--<div class="layui-input-block">--%>
 
+                                <%--<form:select id="projectType" path="projectType" onchange="changeProjectTypess(this.value);" class="form-control simple-select required">--%>
 
+                                    <%--<form:option value="" label=""/>--%>
 
+                                    <%--<form:options id="test" items="${fns:getDictList('work_material_engineer_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
 
+                                <%--</form:select>--%>
 
+							<%--</div>--%>
 
+						<%--</div>--%>
 
+						<%--<div class="layui-item athird">--%>
 
+							<%--<div class="input-group">--%>
 
+								<%--<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
 
+								<%--<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
 
+								<%--<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
 
+							<%--</div>--%>
 
+						<%--</div>--%>
 
+						<%--<div id="moresees" style="clear:both;display:none;">--%>
 
+							<%--<div class="layui-item query athird">--%>
 
+								<%--<label class="layui-form-label">工程部位：</label>--%>
 
+								<%--<div class="layui-input-block">--%>
 
+                                    <%--<form:select path="projectPart" id="projectPart" onchange="changeTryEndTime(this.value);" class="form-control simple-select required">--%>
 
+                                        <%--<form:option value="" label=""/>--%>
 
+                                        <%--<form:options items="${fns:getDictList('work_material_engineer_part1')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
 
+                                    <%--</form:select>--%>
 
+								<%--</div>--%>
 
+							<%--</div>--%>
 
+							<%--<div class="layui-item query athird">--%>
 
+								<%--<label class="layui-form-label">工程地点：</label>--%>
 
+								<%--<div class="layui-input-block">--%>
 
+									<%--<input id="projectSite" name="projectSite" type="text"  maxlength="64" class=" form-control  layui-input laydate-icon" value="${workMaterialCollectEngineer.projectSite}" />--%>
 
+									<%--</input>--%>
 
+								<%--</div>--%>
 
+							<%--</div>--%>
 
+							<%--<div class="layui-item query athird">--%>
 
+								<%--<label class="layui-form-label">项目名称：</label>--%>
 
+								<%--<div class="layui-input-block">--%>
 
+									<%--<input id="projectName" name="projectName" type="text"  maxlength="64" class=" form-control  layui-input laydate-icon" value="${workMaterialCollectEngineer.projectName}" />--%>
 
+									<%--</input>--%>
 
+								<%--</div>--%>
 
+							<%--</div>--%>
 
+						<%--</div>--%>
 
+							<%--<div style="clear:both;"></div>--%>
 
+					<%--</div>--%>
 
+				<%--</form:form>--%>
 
+			<%--</div>--%>
 
+		<%--</div>--%>
 
+
 
+		<div class="full-width fl">
 
+			<div class="contentShadow layui-form contentDetails">
 
+				<%--<div class="nav-btns">--%>
 
+					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
 
+					<%--<shiro:hasPermission name="workitemcollar:workItemCollar:add">--%>
 
+						<%--<a href="javascript:void(0)" onclick="openDialog('新增领用', '${ctx}/workMaterialCollect/engineer/form?tabId=1','95%','95%')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i>&nbsp;添加</a>--%>
 
+					<%--</shiro:hasPermission>--%>
 
+					<%--<shiro:hasPermission name="workMaterialCollect:total:export">--%>
 
+						<%--<table:exportExcel url="${ctx}/workMaterialCollect/total/export"></table:exportExcel><!-- 导出按钮 -->--%>
 
+					<%--</shiro:hasPermission>--%>
 
+						<%--<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
 
+					<%--<div style="clear: both;"></div>--%>
 
+				<%--</div>--%>
 
+				<table class="oa-table layui-table" id="contentTable"></table>
 
+
 
+				<!-- 分页代码 -->
 
+				<table:page page="${page}"></table:page>
 
+				<div style="clear: both;"></div>
 
+			</div>
 
+		</div>
 
+	</div>
 
+	<div id="changewidth"></div>
 
+</div>
 
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 
+<script>
 
+    layui.use('table', function(){
 
+        layui.table.render({
 
+            limit:${ page.pageSize }
 
+            ,elem: '#contentTable'
 
+            ,page: false
 
+            ,cols: [[
 
+                {field:'materialName', align:'center',width:150,title: '材料名称'},
 
+                {field:'specifications', align:'center',width:150,title: '规格'},
 
+                {field:'unit', align:'center',width:150,title: '单位'},
 
+                {field:'excludingTax', align:'center',width:150,title: '除税市场价'},
 
+                {field:'userTheParts', align:'center',width:150,title: '使用部位'},
 
+                {field:'projectDate', align:'center',width:150,title: '工程日期'},
 
+                {field:'projectType', align:'center',width:150,title: '工程类型'},
 
+                {field:'projectSite', align:'center',width:150,title: '工程地点'},
 
+                {field:'projectPart', align:'center',width:150,title: '工程部位'},
 
+                {field:'projectName', align:'center',width:150,title: '项目名称'},
 
+
 
+            ]]
 
+            ,data: [
 
+                <c:if test="${ not empty page.list}">
 
+                <c:forEach items="${page.list}" var="workMaterialCollectTotal" varStatus="index">
 
+                <c:if test="${index.index != 0}">,</c:if>
 
+                {
 
+                    "id":"${workMaterialCollectTotal.id}"
 
+                    ,"materialName":"${workMaterialCollectTotal.materialName}"
 
+                    ,"specifications":"${workMaterialCollectTotal.specifications}"
 
+                    ,"unit":"${workMaterialCollectTotal.unit}"
 
+                    ,"excludingTax":"${workMaterialCollectTotal.excludingTax}"
 
+                    ,"userTheParts":"${workMaterialCollectTotal.userTheParts}"
 
+                    ,"projectDate":"<fmt:formatDate value="${workMaterialCollectTotal.startDate}" pattern="yyyy-MM-dd"/>"+"/"+"<fmt:formatDate value="${workMaterialCollectTotal.endDate}" pattern="yyyy-MM-dd"/>"
 
+                    ,"projectType":"${workMaterialCollectTotal.projectType}"
 
+                    ,"projectSite":"${workMaterialCollectTotal.projectSite}"
 
+                    ,"projectPart":"${workMaterialCollectTotal.projectPart}"
 
+                    ,"projectName":"${workMaterialCollectTotal.projectName}"
 
+
 
+                }
 
+                </c:forEach>
 
+                </c:if>
 
+            ]
 
+        });
 
+
 
+    })
 
+    resizeListTable();
 
+</script>
 
+<script>
 
+    resizeListWindow1();
 
+    $(window).resize(function(){
 
+        resizeListWindow1();
 
+    });
 
+</script>
 
+<script type="text/javascript">
 
+    $(document).ready(function() {
 
+        $("#cus_name").show();
 
+        $("#cus_name").siblings().hide();
 
+        //搜索框收放
 
+        $('#moresee').click(function(){
 
+            if($('#moresees').is(':visible'))
 
+            {
 
+                $('#moresees').slideUp(0,resizeListWindow1);
 
+                $('#moresee i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
 
+            }else{
 
+                $('#moresees').slideDown(0,resizeListWindow1);
 
+                $('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
 
+            }
 
+        });
 
+
 
+        laydate.render({
 
+            elem: '#beginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
 
+            format: 'yyyy-MM-dd',
 
+            type : 'date'
 
+        });
 
+
 
+        laydate.render({
 
+            elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
 
+            format: 'yyyy-MM-dd',
 
+            type : 'date'
 
+        });
 
+
 
+    });
 
+    function switchInput(obj){
 
+        $("#"+obj).show();
 
+        $("#"+obj).siblings().hide();
 
+    }
 
+
 
+    function openDialogremodify(title,url,width,height,target){
 
+
 
+        if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
 
+            width='auto';
 
+            height='auto';
 
+        }else{//如果是PC端，根据用户设置的width和height显示。
 
+
 
+        }
 
+        top.layer.open({
 
+            type: 2,
 
+            area: [width, height],
 
+            title: title,
 
+            skin: 'two-btns',
 
+            maxmin: true, //开启最大化最小化按钮
 
+            content: url ,
 
+            btn: ['重新申请','关闭'],
 
+            yes: function(index, layero){
 
+                var body = top.layer.getChildFrame('body', index);
 
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
 
+                var inputForm = body.find('#inputForm');
 
+                var top_iframe;
 
+                if(target){
 
+                    top_iframe = target;//如果指定了iframe，则在改frame中跳转
 
+                }else{
 
+                    top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
 
+                }
 
+                inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
 
+
 
+                if(iframeWin.contentWindow.doSubmit() ){
 
+                    top.layer.close(index);//关闭对话框。
 
+                    //setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
 
+                }
 
+
 
+            }
 
+
 
+        });
 
+    }
 
+    function openDialog(title,url,width,height,target) {
 
+        if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
 
+            width = 'auto';
 
+            height = 'auto';
 
+        } else {//如果是PC端，根据用户设置的width和height显示。
 
+        }
 
+        top.layer.open({
 
+            type: 2,
 
+            area: [width, height],
 
+            title: title,
 
+            maxmin: true, //开启最大化最小化按钮
 
+            content: url,
 
+            skin: 'three-btns',
 
+            btn: ['确定', '关闭'],
 
+            btn1: function(index, layero){
 
+                var body = top.layer.getChildFrame('body', index);
 
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
 
+                var inputForm = body.find('#inputForm');
 
+                var top_iframe;
 
+                if(target){
 
+                    top_iframe = target;//如果指定了iframe，则在改frame中跳转
 
+                }else{
 
+                    top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
 
+                }
 
+                inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
 
+                if(iframeWin.contentWindow.doSubmit(1) ){
 
+                    // top.layer.close(index);//关闭对话框。
 
+                    setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
 
+                }
 
+            },
 
+            btn2: function (index) {
 
+            }
 
+        });
 
+    }
 
+</script>
 
+</body>
 
+</html>