7/26

src/main/java/com/jeeplus/modules/sealMaterial/service/SealMaterialService.java

@@ -48,7 +48,7 @@ public class SealMaterialService extends CrudService<SealMaterialDao,SealMateria
         }
 //        如果列表长度和set长度不符合，代表有不符合条件的参数
         if(sealMaterialInfoImportList.size() != set.size()){
-            stringBuilder.append(" 数据中存在重复材料，无法进行添加");
+            stringBuilder.append(" 数据中存在重复用章材料，无法进行添加");
             map.put("failure",stringBuilder);
             return map;
         }
@@ -66,7 +66,7 @@ public class SealMaterialService extends CrudService<SealMaterialDao,SealMateria
             return  map;
         }else {
             String join = StringUtils.join(materialNameList, "，");
-            stringBuilder.append("材料 " + join + " 已存在,请勿重复添加");
+            stringBuilder.append("用章材料 " + join + " 已存在,请勿重复添加");
             map.put("failure",stringBuilder);
             return map;
         }

src/main/resources/mappings/modules/sealMaterial/sealMaterialDao.xml

@@ -23,7 +23,7 @@
 		(id,create_by,create_date,update_by,update_date,remarks,del_flag,seal_material_name,amount,main_contents,agent,seal_contents_remarks,project_id)
 		values
 		<foreach collection="sealMaterialInfoImportList" item="data" separator=",">
-			(#{data.id},#{data.createBy.id},#{data.createDate},#{data.updateBy.id},#{data.updateDate},' ',#{data.delFlag},#{data.sealMaterialName},#{data.amount},#{data.mainContents},#{data.agent.name},#{data.sealMaterialImportRemarks},#{data.projectId})
+			(#{data.id},#{data.createBy.id},#{data.createDate},#{data.updateBy.id},#{data.updateDate},' ',#{data.delFlag},#{data.sealMaterialName},#{data.amount},#{data.mainContents},#{data.agent.id},#{data.sealMaterialImportRemarks},#{data.projectId})
 		</foreach>
 	</insert>
 
@@ -43,7 +43,8 @@
 	</select>
 
 	<select id="findExportList" resultType="com.jeeplus.modules.sealMaterial.entity.SealMaterialInfoExport">
-		select seal_material_name as "sealMaterialName",amount as "amount",main_contents as "mainContents",agent as "agent",use_seal_time as "useSealTime",seal_contents_remarks as "sealMaterialImportRemarks"
+		select seal_material_name as "sealMaterialName",amount as "amount",main_contents as "mainContents",
+		 as "agent",use_seal_time as "useSealTime",seal_contents_remarks as "sealMaterialImportRemarks"
 		from seal_material_info
 		where project_id = #{projectId}
 	</select>

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

@@ -1281,18 +1281,18 @@
                                         <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
                                     </td>
                                     <td>
-                                        <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                        <sys:treeselectt id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+                                            title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>
 									</td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID"  name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_major"   name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control required"/>
                                     </td>
                                     <td>
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control judgment"/>

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp

@@ -619,7 +619,7 @@
 							<label class="layui-form-label">项目编号：</label>
 							<div class="layui-input-block">
 								<div class="input-group">
-									<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordPlans.projectId}"/>
+									<input htmlEscape="false"   class="form-control layui-input" value="${projectRecordPlans.projectId}"/>
 								</div>
 							</div>
 						</div>

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordForm.jsp

@@ -241,7 +241,7 @@
 				<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="recordNum" path="recordNum" htmlEscape="false" maxlength="64" class="form-control layui-input judgment"/>
+						<form:input id="recordNum" path="recordNum" htmlEscape="false" maxlength="64" class="form-control layui-input judgment" readonly="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">

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

@@ -1142,7 +1142,7 @@
 									</td>
 									<td>
 										<sys:reportedtreeselectUser id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" value="${info.zixunyuan}" labelName="workAccountList[${status.index+1}].zixunyuan" labelValue="${info.zixunyuanName}"
-																	title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+																		title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 									</td>
 
 									<td>
@@ -1178,8 +1178,10 @@
                                         <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
                                     </td>
                                     <td>
-                                        <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+<%--                                        <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"--%>
+<%--                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
+                                    		    <sys:treeselectt id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+                                         		title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 
 									<td>

src/main/webapp/webpage/modules/ruralprojectrecords/view/workClientAndContractView.jsp

@@ -143,6 +143,7 @@
                     <div class="layui-input-block">
                         <input type="radio" name="company" value="0" title="东兴" disabled <c:if test="${workContractInfo.company=='0'}">checked</c:if>>
                         <input type="radio" name="company" value="1" title="赣能" disabled <c:if test="${workContractInfo.company=='1'}">checked</c:if> >
+                        <input type="radio" name="company" value="2" title="一达嘉鸿" disabled <c:if test="${workContractInfo.company=='1'}">checked</c:if> >
                     </div>
                 </div>
 

src/main/webapp/webpage/modules/workcontractinfo/newWorkContract/workContractInfoFormAdd.jsp

@@ -819,6 +819,7 @@
 								<div class="layui-input-block">
 									<input type="radio" name="company" value="0" title="东兴"<c:if test="${workContractInfo.company=='0'}">checked</c:if>>
 									<input type="radio" name="company" value="1" title="赣能"<c:if test="${workContractInfo.company=='1'}">checked</c:if> >
+									<input type="radio" name="company" value="2" title="一达嘉鸿"<c:if test="${workContractInfo.company=='2'}">checked</c:if> >
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAdminForm.jsp

@@ -734,6 +734,7 @@
 								<div class="layui-input-block">
 									<input type="radio" name="company" value="0" title="东兴"<c:if test="${workContractInfo.company=='0'}">checked</c:if>>
 									<input type="radio" name="company" value="1" title="赣能"<c:if test="${workContractInfo.company=='1'}">checked</c:if> >
+									<input type="radio" name="company" value="2" title="一达嘉鸿"<c:if test="${workContractInfo.company=='2'}">checked</c:if>>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoLookForm.jsp

@@ -251,6 +251,7 @@
 							<div class="layui-input-block">
 								<input type="radio" name="company" value="0" title="东兴" disabled <c:if test="${workContractInfo.company=='0'}">checked</c:if>>
 								<input type="radio" name="company" value="1" title="赣能" disabled <c:if test="${workContractInfo.company=='1'}">checked</c:if> >
+								<input type="radio" name="company" value="2" title="一达嘉鸿" disabled <c:if test="${workContractInfo.company=='2'}">checked</c:if>>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">