咨询员信息(资格证号/专业)

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -1167,8 +1167,13 @@ public class RuralCostProjectMessageController extends BaseController {
             //判定是否是一级造价师
             if ("161".equals( workStaff.getName())){
                 workStaffCertificate.setName(workStaff.getName());
-                workStaffCertificate.setNum(workStaff.getName());
-                workStaffCertificate.setMajor(workStaff.getMajor());
+                workStaffCertificate.setNum(workStaff.getNum());
+                List<MainDictDetail> mainDictDetails=DictUtils.getMainDictListOnProjectAdvent("certificate_major");
+                for (MainDictDetail mainDictDetail:mainDictDetails){
+                    if (mainDictDetail.getValue().equals(workStaff.getMajor())){
+                        workStaffCertificate.setMajor(mainDictDetail.getLabel());
+                    }
+                }
             }
         }
         return workStaffCertificate;

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -1045,6 +1045,7 @@ public class WorkContractInfoController extends BaseController {
             workContractInfo.setCreateName(name);
             workContractInfo.setCreateCompany(comId);
             workContractInfo.setCompanyId(comId);
+            workContractInfo.setOfficeId(UserUtils.getSelectOffice().getId());
             List<WorkClientAttachment> list = workContractInfo.getWorkAttachments();
             List<WorkClientAttachment> list1 = new ArrayList<>();
             List<WorkClientAttachment> list2 = new ArrayList<>();

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportForm.jsp

@@ -389,10 +389,10 @@
 			var rf = $("#reviewFee").val();
 			var af = $("#approvalFee").val();
 			if(rf != ''&& af !=''){
-				var hf = parseInt(rf)-parseInt(af);
-				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
-				$("#verifyFee").val(hf);
-				$("#verifyRate").val(rate);
+				var hf = (rf*100-af*100)/100;
+				var rate = parseFloat(hf) / parseFloat(rf) * 100
+				$("#verifyFee").val(hf.toFixed(2));
+				$("#verifyRate").val(rate.toFixed(2));
 			}
 			if(af !=''){
 				$("#consultFee").val(af)
@@ -418,10 +418,10 @@
 			//安装
 			var inf = $("#installFee").val();
 			if(rf != ''&& af !=''){
-				var hf = parseInt(rf)-parseInt(af);
-				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
-				$("#verifyFee").val(hf);
-				$("#verifyRate").val(rate);
+				var hf = (rf*100-af*100)/100;
+				var rate = parseFloat(hf) / parseFloat(rf) * 100
+				$("#verifyFee").val(hf.toFixed(2));
+				$("#verifyRate").val(rate.toFixed(2));
 			}
 			if(af !=''){
 				$("#consultFee").val(af)

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportModify.jsp

@@ -378,10 +378,10 @@
 			var rf = $("#reviewFee").val();
 			var af = $("#approvalFee").val();
 			if(rf != ''&& af !=''){
-				var hf = parseInt(rf)-parseInt(af);
-				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
-				$("#verifyFee").val(hf);
-				$("#verifyRate").val(rate);
+				var hf = (rf*100-af*100)/100;
+				var rate = parseFloat(hf) / parseFloat(rf) * 100
+				$("#verifyFee").val(hf.toFixed(2));
+				$("#verifyRate").val(rate.toFixed(2));
 			}
 			if(af !=''){
 				$("#consultFee").val(af)
@@ -396,10 +396,10 @@
 			//安装
 			var inf = $("#installFee").val();
 			if(rf != ''&& af !=''){
-				var hf = parseInt(rf)-parseInt(af);
-				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
-				$("#verifyFee").val(hf);
-				$("#verifyRate").val(rate);
+				var hf = (rf*100-af*100)/100;
+				var rate = parseFloat(hf) / parseFloat(rf) * 100
+				$("#verifyFee").val(hf.toFixed(2));
+				$("#verifyRate").val(rate.toFixed(2));
 			}
 			if(af !=''){
 				$("#consultFee").val(af)

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageLists.jsp

@@ -654,7 +654,7 @@
 						}},
                     {field: 'contractName', align:'center', title: '合同名称',width:180,templet: function(d){
 							if(0 == d.pid){
-								if(""!= d.contractName){
+								if(""!= d.contractName && null!= d.contractName ){
 									<%--return "<a class=\"attention-info pid\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contractName + "</a>";--%>
 									return d.contractName;
 								}else{

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -956,6 +956,7 @@
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('attachment_project_sort_cost')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
+                        <span class="spanzj">与归档资料关联,请仔细选择</span>
                     </div>
                 </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsModify.jsp

@@ -33,6 +33,11 @@
         .notForbidden{
             background-color:#3ca2e0;
         }
+        .spanzj{
+            color: red;
+            font-size: 12px;
+            padding-left: 10px;
+        }
     </style>
     <script type="text/javascript">
 		var validateForm;
@@ -913,6 +918,7 @@
                     <div class="layui-input-block  with-icon">
                         <sys:reportedtreeselectUser id="projectMaster" name="projectMasterId" value="${ruralProjectRecords.projectMasterId}" labelName="projectMasterName" labelValue="${ruralProjectRecords.projectMasterName}"
                                                     cssStyle="background-color:#fff" title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <span class="spanzj">必须拥有一级造价师证书</span>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -965,6 +971,7 @@
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('attachment_project_sort_cost')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
+                        <span class="spanzj">与归档资料关联,请仔细选择</span>
                     </div>
                 </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -971,6 +971,7 @@
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('attachment_project_sort')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
+                        <span class="spanzj">与归档资料关联,请仔细选择</span>
                     </div>
                 </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsModify.jsp

@@ -35,6 +35,11 @@
         .notForbidden{
             background-color:#3ca2e0;
         }
+        .spanzj{
+            color: red;
+            font-size: 12px;
+            padding-left: 10px;
+        }
     </style>
     <script type="text/javascript">
 		var validateForm;
@@ -905,6 +910,7 @@
                     <div class="layui-input-block  with-icon">
                         <sys:reportedtreeselectUser id="projectMaster" name="projectMasterId" value="${projectRecords.projectMasterId}" labelName="projectMasterName" labelValue="${projectRecords.projectMasterName}" cssStyle="background-color: #fff"
                                                title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <span class="spanzj">必须拥有一级造价师证书</span>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -957,6 +963,7 @@
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('attachment_project_sort')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
+                        <span class="spanzj">与归档资料关联,请仔细选择</span>
                     </div>
                 </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify.jsp

@@ -199,10 +199,10 @@
             var rf = $("#reviewFee").val();
             var af = $("#approvalFee").val();
             if(rf != ''&& af !=''){
-                var hf = parseInt(rf)-parseInt(af);
-                var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
-                $("#verifyFee").val(hf);
-                $("#verifyRate").val(rate);
+                var hf = (rf*100-af*100)/100;
+                var rate = parseFloat(hf) / parseFloat(rf) * 100
+                $("#verifyFee").val(hf.toFixed(2));
+                $("#verifyRate").val(rate.toFixed(2));
             }
             if(af !=''){
                 $("#consultFee").val(af)
@@ -217,10 +217,10 @@
             //安装
             var inf = $("#installFee").val();
             if(rf != ''&& af !=''){
-                var hf = parseInt(rf)-parseInt(af);
-                var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
-                $("#verifyFee").val(hf);
-                $("#verifyRate").val(rate);
+                var hf = (rf*100-af*100)/100;
+                var rate = parseFloat(hf) / parseFloat(rf) * 100
+                $("#verifyFee").val(hf.toFixed(2));
+                $("#verifyRate").val(rate.toFixed(2));
             }
             if(af !=''){
                 $("#consultFee").val(af)

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportForm.jsp

@@ -375,10 +375,10 @@
 			var rf = $("#reviewFee").val();
 			var af = $("#approvalFee").val();
 			if(rf != ''&& af !=''){
-				var hf = parseInt(rf)-parseInt(af);
-				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
-				$("#verifyFee").val(hf);
-				$("#verifyRate").val(rate);
+				var hf = (rf*100-af*100)/100;
+				var rate = parseFloat(hf) / parseFloat(rf) * 100
+				$("#verifyFee").val(hf.toFixed(2));
+				$("#verifyRate").val(rate.toFixed(2));
 			}
 			if(af !=''){
 				$("#consultFee").val(af)
@@ -404,10 +404,10 @@
 			//安装
 			var inf = $("#installFee").val();
 			if(rf != ''&& af !=''){
-				var hf = parseInt(rf)-parseInt(af);
-				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
-				$("#verifyFee").val(hf);
-				$("#verifyRate").val(rate);
+				var hf = (rf*100-af*100)/100;
+				var rate = parseFloat(hf) / parseFloat(rf) * 100
+				$("#verifyFee").val(hf.toFixed(2));
+				$("#verifyRate").val(rate.toFixed(2));
 			}
 			if(af !=''){
 				$("#consultFee").val(af)

src/main/webapp/webpage/modules/sys/tagTreeselectArae.jsp

@@ -188,6 +188,14 @@
 						for(var i=0; i<nodes.length; i++) {
 							tree.expandNode(nodes[i], true, false, false);
 						}
+						//默认展开到查询的节点
+						var nodes = tree.transformToArray(tree.getNodes());
+						for(var i=0; i<nodes.length; i++) {
+							//展开相关的字节点
+							tree.expandNode(nodes[i], true, true, true);
+							//配合使用打开相关联的父节点
+							tree.selectNode(nodes[i]);
+						}
 						//异步加载子节点（加载用户）
 						var nodesOne = tree.getNodesByParam("isParent", true);
 						for(var j=0; j<nodesOne.length; j++) {

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -1147,6 +1147,7 @@
                             <th width="11%">注册日期</th>
                             <th width="11%"><span class="require-item">*</span>发证日期</th>
                             <th width="10%">发证机关</th>
+                            <th width="10%">专业</th>
                             <th width="10%">文件</th>
                             <th width="10%">操作</th>
                         </tr>
@@ -1181,7 +1182,13 @@
                                 <td>
                                     <input id="certificateList${varStatus.index}_issuingAuthority" name="certificateList[${varStatus.index}].issuingAuthority" class="form-control" value="${certificate.issuingAuthority}"/>
                                 </td>
-
+                                <td>
+                                    <select name="certificateList[${varStatus.index}].major" id="certificateList${varStatus.index}_major" class="form-control required">
+                                        <c:forEach items="${fns:getMainDictList('certificate_major')}" var="var">
+                                            <option value="${var.value}" <c:if test="${certificate.name eq var.value}">selected</c:if>>${var.label}</option>
+                                        </c:forEach>
+                                    </select>
+                                </td>
                                 <td  class="text-center op-td">
                                     <a class="op-btn op-btn-add" title="上传" onclick="this_upload_file_button('certificateList${varStatus.index}_file')"><i class="fa fa-plus"></i>&nbsp;上传</a><span id="certificateList${varStatus.index}_fileName1"><c:if test="${not empty certificate.filePath}"><img src="${certificate.filePath}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${certificate.filePath}','90%','90%')" alt=""></c:if></span>
                                     <input id="certificateList${varStatus.index}_file" name="certificateList[${varStatus.index}].file" style="display:none" type="file" onchange="changeFileName(this,1)"/>
@@ -1223,6 +1230,13 @@
                                 <td>
                                     <input placeholder="请输入发证机关" id="certificateList{{idx}}_issuingAuthority" name="certificateList[{{idx}}].issuingAuthority" class="form-control" value="{{row.issuingAuthority}}"/>
                                 </td>
+                                <td>
+                                    <select name="certificateList[{{idx}}].major" id="certificateList{{idx}}_major" class="form-control required">
+                                        <c:forEach items="${fns:getMainDictList('certificate_major')}" var="var">
+                                            <option value="${var.value}" <c:if test="${certificate.name eq var.value}">selected</c:if>>${var.label}</option>
+                                        </c:forEach>
+                                    </select>
+                                </td>
                                 <td class="text-center op-td">
                                     <a class="op-btn op-btn-add" title="上传" onclick="this_upload_file_button('certificateList{{idx}}_file')"><i class="fa fa-plus"></i>&nbsp;上传</a><span id="certificateList{{idx}}_fileName1"></span>
                                     <input id="certificateList{{idx}}_file" name="certificateList[{{idx}}].file" style="display:none" type="file" onchange="changeFileName(this,1)"/>

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoList.jsp

@@ -56,6 +56,7 @@
                 title: title,
                 maxmin: true, //开启最大化最小化按钮
                 content: url,
+                skin: 'three-btns',
                 btn: ["提交","关闭"],
                 btn1: function(index, layero){
                     var body = top.layer.getChildFrame('body', index);