主委托方变更为委托方

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectRecordsDao.java

@@ -30,4 +30,15 @@ public interface RuralProjectRecordsDao extends CrudDao<RuralProjectRecords> {
     List<RuralProjectRecords> findPageByRe(RuralProjectRecords records);
     int queryCount(RuralProjectRecords records);
     int queryCountByStatus(RuralProjectRecords records);
+
+    /**
+     * admin修改项目基本信息
+     * @param records
+     */
+    void adminUpdateProject(RuralProjectRecords records);
+    /**
+     * admin删除项目信息
+     * @param records
+     */
+    void adminDelete(RuralProjectRecords records);
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -73,6 +73,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String prrId;
 	private String projectReportName;
 	private String officeName;
+	private String flagAdmin;
 
 	public String getPrrId() {
 		return prrId;
@@ -683,4 +684,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setEstimateTotalFees(Double estimateTotalFees) {
 		this.estimateTotalFees = estimateTotalFees;
 	}
+
+	public String getFlagAdmin() {
+		return flagAdmin;
+	}
+
+	public void setFlagAdmin(String flagAdmin) {
+		this.flagAdmin = flagAdmin;
+	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -184,6 +184,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_COST_WORK_RECORDS.getValue());
 			}
             projectRecords.getSqlMap().put("dsf", dataScopeSql);
+			projectRecords.getSqlMap().put("delFlag", "AND a.del_flag = 0");
         }
         int count = dao.queryCount(projectRecords);
         page.setCount(count);
@@ -303,6 +304,34 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		logger.info("保存项目耗时：{}ms;启动流程耗时：{}ms",t4-t1,System.currentTimeMillis()-t4);
 	}
 
+	/**
+	 * 管理员修改项目信息
+	 * @param projectRecords
+	 * @throws Exception
+	 */
+	@Transactional(readOnly = false)
+	public void adminUpdateProject(RuralProjectRecords projectRecords){
+		WorkContractInfo workContractInfo = null;
+		Office company= new Office();
+		Office office =  new Office();
+		if(StringUtils.isNotBlank((projectRecords.getWorkContractInfo().getId()))){
+			//有合同状态
+			workContractInfo = workContractInfoDao.get(projectRecords.getWorkContractInfo().getId());
+			company.setId(workContractInfo.getCompanyId());
+			office.setId(UserUtils.getUser().getOffice().getId());
+		}else{
+			//无合同
+			company.setId(UserUtils.getUser().getCompany().getId());
+			office.setId(UserUtils.getUser().getOffice().getId());
+		}
+		projectRecords.setCompany(company);
+		projectRecords.setOffice(office);
+		projectRecords.preUpdate();
+		dao.adminUpdateProject(projectRecords);
+	}
+
+
+
     private void copyAttachments(RuralProjectRecords projectRecords) {
         if (projectRecords==null||projectRecords.getWorkAttachments()==null||projectRecords.getWorkAttachments().isEmpty()){
             return;
@@ -381,27 +410,6 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		workProjectUserDao.batchInsert(map);
 	}
 
-	@Transactional(readOnly = false)
-	public void delete(RuralProjectRecords projectRecords) {
-		//删除项目负责人
-		workProjectUserDao.deleteProjectMembers(projectRecords.getId(), "1");
-		//删除项目组成员
-		workProjectUserDao.deleteProjectMembers(projectRecords.getId(), "0");
-		//删除委托方联系人
-		clientLinkmanDao.deleteProjectLinkmans(projectRecords.getId(), 1);
-		//删除施工方联系人
-		clientLinkmanDao.deleteProjectLinkmans(projectRecords.getId(), 0);
-		super.delete(projectRecords);
-        WorkProjectNotify notify = new WorkProjectNotify();
-        notify.setNotifyId(projectRecords.getId());
-        List<User> users = workProjectNotifyService.readByNotifyId(notify);
-        if (users!=null && users.size()!=0){
-            for (User user:users){
-                UserUtils.pushMeIm(user.getId());
-            }
-        }
-	}
-
 	/**
 	 * 设置项目组成员信息
 	 *
@@ -421,6 +429,41 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		records.setMemberIds(Collections3.extractToString(members, "id", ","));
 	}
 
+	@Transactional(readOnly = false)
+	public void delete(RuralProjectRecords projectRecords) {
+		/*//删除项目负责人
+		workProjectUserDao.deleteProjectMembers(projectRecords.getId(), "1");
+		//删除项目组成员
+		workProjectUserDao.deleteProjectMembers(projectRecords.getId(), "0");
+		//删除委托方联系人
+		clientLinkmanDao.deleteProjectLinkmans(projectRecords.getId(), 1);
+		//删除施工方联系人
+		clientLinkmanDao.deleteProjectLinkmans(projectRecords.getId(), 0);*/
+		super.delete(projectRecords);
+		WorkProjectNotify notify = new WorkProjectNotify();
+		notify.setNotifyId(projectRecords.getId());
+		List<User> users = workProjectNotifyService.readByNotifyId(notify);
+		if (users!=null && users.size()!=0){
+			for (User user:users){
+				UserUtils.pushMeIm(user.getId());
+			}
+		}
+	}
+
+	@Transactional(readOnly = false)
+	public void adminDelete(RuralProjectRecords projectRecords) {
+		dao.adminDelete(projectRecords);
+		super.delete(projectRecords);
+		WorkProjectNotify notify = new WorkProjectNotify();
+		notify.setNotifyId(projectRecords.getId());
+		List<User> users = workProjectNotifyService.readByNotifyId(notify);
+		if (users!=null && users.size()!=0){
+			for (User user:users){
+				UserUtils.pushMeIm(user.getId());
+			}
+		}
+	}
+
 	/**
 	 * 设置项目组成员所属部门信息
 	 *

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

@@ -110,6 +110,12 @@ public class RuralProjectRecordsController extends BaseController {
 					records1.setWorkContractInfo(contractInfo);
 				}
 			}
+			//判断是否为admin
+			if (UserUtils.isManager()){
+				records1.setFlagAdmin("1");
+			}else{
+				records1.setFlagAdmin("0");
+			}
 		}
 		model.addAttribute("page", page);
 		return "modules/ruralprojectrecords/ruralProjectRecordsList";
@@ -203,6 +209,23 @@ public class RuralProjectRecordsController extends BaseController {
 		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
 	}
 
+	/**
+	 * 管理员修改项目信息
+	 */
+	@RequestMapping(value = "adminUpdate")
+	public String adminUpdate(RuralProjectRecords projectRecords, RedirectAttributes redirectAttributes){
+		try {
+			RuralProjectRecords t = projectRecordsService.get(projectRecords.getId());//从数据库取出记录的值
+			MyBeanUtils.copyBeanNotNull2Bean(projectRecords, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+			projectRecordsService.adminUpdateProject(t);//管理员修改项目信息
+            addMessage(redirectAttributes, "管理员修改项目成功");
+        }catch (Exception e){
+            logger.error("管理员修改项目异常：",e);
+            addMessage(redirectAttributes, "管理员修改项目异常:"+e.getMessage());
+        }
+		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+	}
+
     /**
      * 编辑项目表单页面
      */
@@ -228,6 +251,19 @@ public class RuralProjectRecordsController extends BaseController {
         return "modules/ruralprojectrecords/ruralProjectRecordsModify";
     }
 
+
+
+	/**
+	 * 编辑项目表单页面
+	 */
+	@RequestMapping(value = "adminModify")
+	public String adminModify(RuralProjectRecords projectRecords, Model model) {
+		projectRecords=projectRecordsService.get(projectRecords.getId());
+		projectRecordsService.queryProjectDetail(projectRecords);
+		model.addAttribute("projectRecords", projectRecords);
+		return "modules/ruralprojectrecords/ruralProjectRecordsAdminModify";
+	}
+
 	/**
 	 * 删除项目
 	 */
@@ -237,10 +273,26 @@ public class RuralProjectRecordsController extends BaseController {
 		int status = projectRecords.getProjectStatus();
 		if(status== ProjectStatusEnum.TSTORE.getValue()||status== ProjectStatusEnum.REJECTED.getValue()||status== ProjectStatusEnum.RECALL.getValue()){
 			projectRecordsService.delete(projectRecords);
-			addMessage(redirectAttributes, "删除项目成功");
+			addMessage(redirectAttributes, "作废项目成功");
+			return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+		}else {
+			addMessage(redirectAttributes, "作废项目失败，只有“暂存”、“驳回”、“撤回”状态的项目才能作废");
+		}
+		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+	}
+
+	/**
+	 * 删除项目
+	 */
+	@RequestMapping(value = "adminDelete")
+	public String adminDelete(RuralProjectRecords projectRecords, RedirectAttributes redirectAttributes) {
+		int status = projectRecords.getProjectStatus();
+		if(status== ProjectStatusEnum.SIGNED.getValue()){
+			projectRecordsService.adminDelete(projectRecords);
+			addMessage(redirectAttributes, "管理员删除项目成功");
 			return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
 		}else {
-			addMessage(redirectAttributes, "删除项目失败，只有“暂存”、“驳回”、“撤回”状态的项目才能删除");
+			addMessage(redirectAttributes, "管理员删除项目失败");
 		}
 		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
 	}

src/main/java/com/jeeplus/modules/sys/utils/DictUtils.java

@@ -17,6 +17,7 @@ import com.jeeplus.modules.sys.dao.MainDictDetailDao;
 import com.jeeplus.modules.sys.entity.Dict;
 import com.jeeplus.modules.sys.entity.MainDict;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
+import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.MainDictService;
 import org.apache.commons.lang3.StringUtils;
 import redis.clients.jedis.Jedis;
@@ -25,9 +26,7 @@ import java.beans.IntrospectionException;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 字典工具类
@@ -146,6 +145,39 @@ public class DictUtils {
 		return dictList;
 	}
 
+	public static List<Dict> getRuralDictList(String type){
+		@SuppressWarnings("unchecked")
+		Map<String, List<Dict>> dictMap = null;
+		if (dictMap==null){
+			dictMap = Maps.newHashMap();
+			for (Dict dict : dictDao.findAllList(new Dict())){
+				List<Dict> dictList = dictMap.get(dict.getType());
+				if (dictList != null){
+					dictList.add(dict);
+				}else{
+					dictMap.put(dict.getType(), Lists.newArrayList(dict));
+				}
+			}
+			CacheUtils.put(CACHE_DICT_MAP, dictMap);
+		}
+		List<Dict> dictList = dictMap.get(type);
+		if (dictList == null){
+			dictList = Lists.newArrayList();
+		}else{
+			//判断是否为admin
+			if(!UserUtils.isManager()){
+				Iterator iterator = dictList.iterator();
+				while (iterator.hasNext()){
+					Dict dict = (Dict) iterator.next();
+					if("8".equals(dict.getValue())){
+						iterator.remove();
+					}
+				}
+			}
+		}
+		return dictList;
+	}
+
 	/**
 	 * 公司级业务字典
 	 * @param type

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

@@ -178,7 +178,7 @@ public class WorkContractInfoController extends BaseController {
                         info.setOpinion("0");
                     }
                     //判断是否为admin
-                    if ("newUser".equals(user.getRoleList().get(0).getEnname())){
+                    if (UserUtils.isManager()){
                         info.setFlagAdmin("1");
                     }else{
                         info.setFlagAdmin("0");

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -141,7 +141,10 @@
 			<if test="projectType !=null and projectType !=''">
 				and project_type= #{projectType}
 			</if>
-            AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
+
+            <if test="sqlMap.delFlag !=null and sqlMap.delFlag!=''">
+				${sqlMap.delFlag}
+            </if>
             <if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
                AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id} )${sqlMap.dsf} )
             </if>
@@ -229,7 +232,9 @@
             <if test="projectType !=null and projectType !=''">
 				and project_type= #{projectType}
             </if>
-            AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="sqlMap.delFlag !=null and sqlMap.delFlag!=''">
+				${sqlMap.delFlag}
+			</if>
             <if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
                 AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id})${sqlMap.dsf} )
             </if>
@@ -475,12 +480,52 @@
 		    estimate_total_fees = #{estimateTotalFees}
 		WHERE id = #{id}
 	</update>
+
+	<update id="adminUpdateProject">
+		UPDATE rural_project_records SET
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			project_name = #{projectName},
+			contract_id = #{workContractInfo.id},
+			scale_type = #{scaleType},
+			scale_unit = #{scaleUnit},
+			scale_quantity = #{scaleQuantity},
+			area_id = #{area.id},
+			project_site = #{projectSite},
+			project_desc = #{projectDesc},
+			remarks = #{remarks},
+			status = #{projectStatus},
+			company_id = #{company.id},
+			office_id = #{office.id},
+			alter_process_id = #{alterProcessId},
+			province = #{province},
+		    city = #{city},
+		    area_name = #{county},
+		    project_structure =  #{projectStructure},
+		    on_ground_num = #{onGroundNum},
+		    under_ground_num = #{underGroundNum},
+		    building_scale = #{buildingScale},
+		    measuring_unit =  #{measuringUnit},
+		    project_use =  #{projectUse},
+		    install_fees =  #{installFees},
+		    building_fees =  #{buildingFees},
+		    building_percent =  #{buildingPercent},
+		    install_percent =  #{installPercent},
+		    unit_fees = #{unitFees},
+		    building_unit_fees = #{buildingUnitFees},
+		    install_unit_fees =  #{installUnitFees},
+		    total_fees =  #{totalFees},
+		    start_date =  #{startDate},
+		    ending_date =  #{endingDate},
+		    estimate_total_fees = #{estimateTotalFees}
+		WHERE id = #{id}
+	</update>
 	
 	
 	<!--物理删除-->
 	<update id="delete">
 		UPDATE rural_project_records SET
-			del_flag = #{DEL_FLAG_DELETE}
+			status = 7
 		WHERE id = #{id}
 	</update>
 	
@@ -491,6 +536,13 @@
 		WHERE id = #{id}
 	</update>
 
+	<!--逻辑删除-->
+	<update id="adminDelete">
+		UPDATE rural_project_records SET
+			del_flag = 1
+		WHERE id = #{id}
+	</update>
+
 	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
 	<select id="findUniqueByProperty" resultType="RuralProjectRecords" statementType="STATEMENT">
 		select

src/main/webapp/WEB-INF/tlds/fns.tld

@@ -179,6 +179,14 @@
     <function-signature>java.util.List getDictList(java.lang.String)</function-signature>
     <example>${fns:getDictList(type)}</example>  
   </function>
+
+  <function>
+    <description>获取字典对象列表</description>
+    <name>getRuralDictList</name>
+    <function-class>com.jeeplus.modules.sys.utils.DictUtils</function-class>
+    <function-signature>java.util.List getRuralDictList(java.lang.String)</function-signature>
+    <example>${fns:getRuralDictList(type)}</example>
+  </function>
   <function>
     <description>获取公司字典对象列表</description>
     <name>getMainDictList</name>

src/main/webapp/static/common/jeeplus.js

@@ -432,9 +432,8 @@ function getruralProjectState(id)
         case "3":result.label = "cancel";result.status="撤回";break;
         case "4":result.label = "reject";result.status="驳回";break;
         case "5":result.label = "signed";result.status="登记完成";break;
-        case "6":result.label = "discarding";result.status="作废中";break;
-        case "7":result.label = "discarded";result.status="已作废";break;
-        case "8":result.label = "changing";result.status="变更中";break;
+        case "7":result.label = "discarded";result.status="作废";result.action = false;break;
+        case "8":result.label = "discarded";result.status="已删除";result.action = false;break;
         case "10":result.label = "unknown";result.status="待发起";result.action = false;break;
         default:
             result.label = "unknown";result.status="未知";break;

src/main/webapp/webpage/modules/projectConstruction/projectConstructionForm.jsp

@@ -24,7 +24,7 @@
     </style>
     <script type="text/javascript">
         var validateForm;
-        var isMasterClient = true;//是否是主委托方
+        var isMasterClient = true;//是否是委托方
         var clientCount = 0;
         function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 
@@ -141,7 +141,7 @@
             // console.log("success==="+successRows);
             // console.log("clientCount==="+clientCount);
 
-            //如果主委托方还没有设置，则将第一个客户设置为主委托方
+            //如果委托方还没有设置，则将第一个客户设置为委托方
             if(obj[0].name != null){
                 if(isMasterClient){
                     $("#contractClientName").val(obj[0].clientId.name);

src/main/webapp/webpage/modules/projectcontentinfo/projectReportDataList.jsp

@@ -207,7 +207,7 @@
 							</div>
 						</div>
 						<div class="layui-item query athird">
-							<label class="layui-form-label">主委托方：</label>
+							<label class="layui-form-label">委托方：</label>
 							<div class="layui-input-block">
 								<form:input path="clientName" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
@@ -266,7 +266,7 @@
                 ,{field:'projectName', align:'center',title: '所属项目',width:200}
                 ,{field:'projectMaster', align:'center',title: '项目负责人',width:200}
                 ,{field:'contractNum', align:'center',title: '合同编号',width:200}
-                ,{field:'client', align:'center',title: '主委托方',width:200}
+                ,{field:'client', align:'center',title: '委托方',width:200}
             ]]
             ,data: [
                 <c:if test="${ not empty page.list}">

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordAudit.jsp

@@ -118,7 +118,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.clientName}"/>
 					</div>

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordForm.jsp

@@ -162,7 +162,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>主委托方：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>委托方：</label>
 					<div class="layui-input-block">
 						<form:input id="clientName" path="clientName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
 					</div>

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordList.jsp

@@ -200,7 +200,7 @@
 							</div>
 						</div>
 						<div class="layui-item query athird">
-							<label class="layui-form-label">主委托方：</label>
+							<label class="layui-form-label">委托方：</label>
 							<div class="layui-input-block">
 								<form:input path="clientName" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
@@ -262,7 +262,7 @@
                 ,{field:'reportName', align:'center',title: '报告名称',width:200}
                 ,{field:'contractName', align:'center',title: '合同名称',width:200}
                 ,{field:'contractNum', align:'center',title: '合同编号',width:200}
-                ,{field:'clientName', align:'center',title: '主委托方',width:200}
+                ,{field:'clientName', align:'center',title: '委托方',width:200}
                 ,{field:'createDate', align:'center',title: '申请日期',width:200}
                 ,{field:'createBy', align:'center',title: '归档申请人',width:200}
                 ,{ title: '状态', align:'center',sort: true, width:100,templet:function(d){

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordModifyApply.jsp

@@ -159,7 +159,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>主委托方：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>委托方：</label>
 					<div class="layui-input-block">
 						<form:input id="clientName" path="clientName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
 					</div>

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordView.jsp

@@ -72,7 +72,7 @@
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label">主委托方：</label>
+				<label class="layui-form-label">委托方：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.clientName}"/>
 				</div>

src/main/webapp/webpage/modules/projectcontentinfo/projectcontentinfoForm.jsp

@@ -287,7 +287,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
 					</div>

src/main/webapp/webpage/modules/projectcontentinfo/projectcontentinfoList.jsp

@@ -163,7 +163,7 @@
                 ,{field:'projectName', align:'center',title: '项目名称',minWidth:150}
                 ,{field:'projMaster', align:'center',title: '项目负责人',width:80}
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:150}
-                ,{field:'client', align:'center',title: '主委托方',minWidth:150}
+                ,{field:'client', align:'center',title: '委托方',minWidth:150}
                 ,{field:'constructionProjectTypeStr', align:'center',title: '工程分类',width:100}
                 ,{field:'officeName', align:'center',title: '所属部门',width:100}
                 ,{field:'createDate', align:'center',title: '创建日期',width:80}

src/main/webapp/webpage/modules/projectrecord/ftlTemplate/ftlTemplateForm.jsp

@@ -27,7 +27,7 @@
     </style>
     <script type="text/javascript">
         var validateForm;
-        var isMasterClient = true;//是否是主委托方
+        var isMasterClient = true;//是否是委托方
         var clientCount = 0;
         function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanList.jsp

@@ -243,7 +243,7 @@
 				,{field:'projMaster', align:'center',title: '负责人', width:65,templet:function(d){
 						return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
 					}}
-				,{field:'client',align:'center', title: '主委托方',  width:150,templet:function(d){
+				,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
 						return "<span title=\"" + d.client + "\">" + d.client + "</span>";
 					}}
 				,{field:'createDate',align:'center', title: '创建日期',  width:80}

src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterAudit.jsp

@@ -97,7 +97,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label">主委托方：</label>
+                    <label class="layui-form-label">委托方：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.workContractInfo.client.name}"/>
                     </div>

src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterForm.jsp

@@ -98,7 +98,7 @@
                 $("#div1").hide();
                 $("#div3").hide();
                 $("#ext1").iCheck("check");
-                //无合同，将第一个委托方设置为主委托方
+                //无合同，将第一个委托方设置为委托方
                 setTimeout(function () {
                     const ClientName = $("#workClientLinkmanList").find("tr").eq(0).find("td").eq(1).children("input").val().trim();
                     $("#contractClientName").val(ClientName);
@@ -379,7 +379,7 @@
             var delFlag = $(prefix+"_delFlag");
             const clientId = $("#contractClientId").val();
             if(id.val() === clientId){
-                parent.layer.msg('主委托方不允许删除',{icon:5});
+                parent.layer.msg('委托方不允许删除',{icon:5});
                 return;
             }
             $(obj).parent().parent().remove();
@@ -477,7 +477,7 @@
                     </div>
                     <div id="div2">
                         <div class="layui-item layui-col-sm6 lw7">
-                            <label class="layui-form-label">主委托方：</label>
+                            <label class="layui-form-label">委托方：</label>
                             <div class="layui-input-block">
                                 <input path="projectMasterName" htmlEscape="false" readonly="true"
                                        id="contractClientName" name="workContractInfo.client.name"

src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterModify.jsp

@@ -353,7 +353,7 @@
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
-                <label class="layui-form-label">主委托方：</label>
+                <label class="layui-form-label">委托方：</label>
                 <div class="layui-input-block">
                     <input path="projectMasterName" htmlEscape="false"  readonly="true" id="contractClientName" name="workContractInfo.client.name" class="form-control layui-input" value="${projectRecordsAlter.workContractInfo.client.name}"/>
                 </div>

src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterView.jsp

@@ -63,7 +63,7 @@
                                 </div>
                             </div>
                             <div class="layui-item layui-col-sm6 lw6">
-                                <label class="layui-form-label">主委托方：</label>
+                                <label class="layui-form-label">委托方：</label>
                                 <div class="layui-input-block">
                                     <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.workContractInfo.client.name}"/>
                                 </div>
@@ -615,7 +615,7 @@
                             </div>
                         </div>
                         <div class="layui-item layui-col-sm6 lw6">
-                            <label class="layui-form-label">主委托方：</label>
+                            <label class="layui-form-label">委托方：</label>
                             <div class="layui-input-block">
                                 <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.alterBeforeRecords.workContractInfo.client.name}"/>
                             </div>

src/main/webapp/webpage/modules/projectrecord/projectRecordsAudit.jsp

@@ -136,7 +136,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
 					</div>

src/main/webapp/webpage/modules/projectrecord/projectRecordsDetailList.jsp

@@ -240,7 +240,7 @@
 							</div>
 						</div>
 						<div class="layui-item query athird">
-							<label class="layui-form-label">主委托方：</label>
+							<label class="layui-form-label">委托方：</label>
 							<div class="layui-input-block">
 								<form:input path="workContractInfo.client.name" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
@@ -364,7 +364,7 @@
                 ,{field:'contractNumber', align:'center',title: '合同编号',width:200}
                 ,{field:'contractName', align:'center',title: '合同名称',width:200}
                 ,{field:'contractAmt', align:'center',title: '合同金额(元)',width:100}
-                ,{field:'clientName',align:'center', title: '主委托方',width:200}
+                ,{field:'clientName',align:'center', title: '委托方',width:200}
                 ,{field:'contractType',align:'center', title: '工程分类',width:100}
                 ,{field:'scaleType',align:'center', title: '规模类型',width:100}
                 ,{field:'scaleUnit',align:'center', title: '规模单位',width:100}

src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -27,7 +27,7 @@
     </style>
     <script type="text/javascript">
         var validateForm;
-        var isMasterClient = true;//是否是主委托方
+        var isMasterClient = true;//是否是委托方
         var clientCount = 0;
         function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
@@ -265,7 +265,7 @@
             // console.log("success==="+successRows);
             // console.log("clientCount==="+clientCount);
 
-            //如果主委托方还没有设置，则将第一个客户设置为主委托方
+            //如果委托方还没有设置，则将第一个客户设置为委托方
             if(obj[0].name != null){
                 if(isMasterClient){
                     $("#contractClientName").val(obj[0].clientId.name);
@@ -425,7 +425,7 @@
             var delFlag = $(prefix+"_delFlag");
             const clientId = $("#contractClientId").val();
             if(id.val() === clientId){
-                parent.layer.msg('主委托方不允许删除',{icon:5});
+                parent.layer.msg('委托方不允许删除',{icon:5});
                 return;
             }
             $(obj).parent().parent().remove();
@@ -1094,7 +1094,7 @@
                    </div>
                    <div id="divv2">
                        <div class="layui-item layui-col-sm6 lw7">
-                           <label class="layui-form-label">主委托方：</label>
+                           <label class="layui-form-label">委托方：</label>
                            <div class="layui-input-block">
                                <input htmlEscape="false"  readonly="true" id="contractClientName" name="workContractInfo.client.name" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
                            </div>

src/main/webapp/webpage/modules/projectrecord/projectRecordsList.jsp

@@ -340,7 +340,7 @@
                 ,{field:'projMaster', align:'center',title: '负责人', width:65,templet:function(d){
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
                     }}
-                ,{field:'client',align:'center', title: '主委托方',  width:150,templet:function(d){
+                ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                 ,{field:'createName',align:'center', title: '创建人',  width:80}

src/main/webapp/webpage/modules/projectrecord/projectRecordsModify.jsp

@@ -365,7 +365,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">主委托方：</label>
+                    <label class="layui-form-label">委托方：</label>
                     <div class="layui-input-block">
                         <input  htmlEscape="false"  readonly="true" id="contractClientName" name="workContractInfo.client.name" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
                     </div>

src/main/webapp/webpage/modules/projectrecord/projectRecordsView.jsp

@@ -94,7 +94,7 @@
 				   </div>
 			   </div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
 					</div>

src/main/webapp/webpage/modules/projectrecord/summarizing/armorProjectRecordsList.jsp

@@ -300,7 +300,7 @@
                 ,{field:'projMaster', align:'center',title: '负责人', width:85,templet:function(d){
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
                     }}
-                ,{field:'client',align:'center', title: '主委托方',  width:150,templet:function(d){
+                ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}

src/main/webapp/webpage/modules/projectrecord/summarizing/claimSumamarizingProjectRecordsList.jsp

@@ -300,7 +300,7 @@
                 ,{field:'projMaster', align:'center',title: '负责人', width:85,templet:function(d){
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
                     }}
-                ,{field:'client',align:'center', title: '主委托方',  width:150,templet:function(d){
+                ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}

src/main/webapp/webpage/modules/projectrecord/summarizing/concealProjectRecordsList.jsp

@@ -300,7 +300,7 @@
                 ,{field:'projMaster', align:'center',title: '负责人', width:85,templet:function(d){
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
                     }}
-                ,{field:'client',align:'center', title: '主委托方',  width:150,templet:function(d){
+                ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}

src/main/webapp/webpage/modules/projectrecord/summarizing/designSumamarizingProjectRecordsList.jsp

@@ -300,7 +300,7 @@
                 ,{field:'projMaster', align:'center',title: '负责人', width:85,templet:function(d){
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
                     }}
-                ,{field:'client',align:'center', title: '主委托方',  width:150,templet:function(d){
+                ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}

src/main/webapp/webpage/modules/projectrecord/summarizing/distributionSumamarizingProjectRecordsList.jsp

@@ -300,7 +300,7 @@
                 ,{field:'projMaster', align:'center',title: '负责人', width:85,templet:function(d){
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
                     }}
-                ,{field:'client',align:'center', title: '主委托方',  width:150,templet:function(d){
+                ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}

src/main/webapp/webpage/modules/projectrecord/summarizing/materialProjectRecordsList.jsp

@@ -300,7 +300,7 @@
                 ,{field:'projMaster', align:'center',title: '负责人', width:85,templet:function(d){
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
                     }}
-                ,{field:'client',align:'center', title: '主委托方',  width:150,templet:function(d){
+                ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}

src/main/webapp/webpage/modules/projectrecord/summarizing/sumamarizingProjectRecordsList.jsp

@@ -304,7 +304,7 @@
                 ,{field:'projMaster', align:'center',title: '负责人', width:85,templet:function(d){
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
                     }}
-                ,{field:'client',align:'center', title: '主委托方',  width:150,templet:function(d){
+                ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}

src/main/webapp/webpage/modules/projectrecord/summarizing/visaSumamarizingProjectRecordsList.jsp

@@ -300,7 +300,7 @@
                 ,{field:'projMaster', align:'center',title: '负责人', width:85,templet:function(d){
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
                     }}
-                ,{field:'client',align:'center', title: '主委托方',  width:150,templet:function(d){
+                ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/projectEarlyForm.jsp

@@ -152,7 +152,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<form:input id="clientName" path="clientName" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
 					</div>

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/projectReportRecordForm.jsp

@@ -152,7 +152,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<form:input id="clientName" path="clientName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordForm.jsp

@@ -142,7 +142,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>主委托方：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>委托方：</label>
 					<div class="layui-input-block">
 						<input id="clientName" name="clientName"  htmlEscape="false" readonly="true" class="form-control  layui-input required" value="${workClientInfoName}"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordModify.jsp

@@ -175,7 +175,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>主委托方：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>委托方：</label>
 					<div class="layui-input-block">
 						<form:input id="clientName" path="clientName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordView.jsp

@@ -91,7 +91,7 @@
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label">主委托方：</label>
+				<label class="layui-form-label">委托方：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workClientInfoName}"/>
 				</div>

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

@@ -94,7 +94,7 @@
 				   </div>
 			   </div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
 					</div>

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

@@ -290,7 +290,7 @@
                 ,{field:'projMaster', align:'center',title: '负责人', width:65,templet:function(d){
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
                     }}
-                ,{field:'client',align:'center', title: '主委托方',  width:150,templet:function(d){
+                ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
@@ -400,46 +400,46 @@
                     <c:choose>
                         <c:when test="${fn:contains(projectRecords.leaderIds,fns:getUser().id)}">
                             ,"canAdd":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 0 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 0 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
                             ,"canedit1":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 1 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 1 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
                             ,"canedit2":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 4 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 4 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
                             ,"canrecall":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 3 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 3 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
 
                             ,"cancancel":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 2  && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 2  && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
 
                             <%-- 归档状态 --%>
                             ,"recordAdd":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 0 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 0 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordedit1":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 1 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 1 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordedit2":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 4 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 4 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordrecall":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 3 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 3 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordcancel":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 2 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                             <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                         </c:when>

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

@@ -35,7 +35,7 @@
     </style>
     <script type="text/javascript">
         var validateForm;
-        var isMasterClient = true;//是否是主委托方
+        var isMasterClient = true;//是否是委托方
         var clientCount = 0;
         function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
@@ -352,7 +352,7 @@
             }
             clientCount=successRows+clientCount;
 
-            //如果主委托方还没有设置，则将第一个客户设置为主委托方
+            //如果委托方还没有设置，则将第一个客户设置为委托方
             if(obj[0].name != null){
                 if(isMasterClient){
                     $("#contractClientName").val(obj[0].clientId.name);
@@ -636,7 +636,7 @@
                    </div>
                    <div id="divv2">
                        <div class="layui-item layui-col-sm6 lw7">
-                           <label class="layui-form-label">主委托方：</label>
+                           <label class="layui-form-label">委托方：</label>
                            <div class="layui-input-block">
                                <input htmlEscape="false"  readonly="true" id="contractClientName" name="workContractInfo.client.name" class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.client.name}"/>
                            </div>

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

@@ -294,7 +294,7 @@
                 ,{field:'projMaster', align:'center',title: '负责人', width:65,templet:function(d){
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
                     }}
-                ,{field:'client',align:'center', title: '主委托方',  width:150,templet:function(d){
+                ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}

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

@@ -398,7 +398,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">主委托方：</label>
+                    <label class="layui-form-label">委托方：</label>
                     <div class="layui-input-block">
                         <input  htmlEscape="false"  readonly="true" id="contractClientName" name="workContractInfo.client.name" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
                     </div>

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

@@ -94,7 +94,7 @@
 				   </div>
 			   </div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordForm.jsp

@@ -143,7 +143,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>主委托方：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>委托方：</label>
 					<div class="layui-input-block">
 						<input id="clientName" name="clientName"  htmlEscape="false" readonly="true" class="form-control  layui-input required" value="${workClientInfoName}"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordModify.jsp

@@ -175,7 +175,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>主委托方：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>委托方：</label>
 					<div class="layui-input-block">
 						<form:input id="clientName" path="clientName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordView.jsp

@@ -91,7 +91,7 @@
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label">主委托方：</label>
+				<label class="layui-form-label">委托方：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workClientInfoName}"/>
 				</div>

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

@@ -97,7 +97,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label">主委托方：</label>
+                    <label class="layui-form-label">委托方：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.workContractInfo.client.name}"/>
                     </div>

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

@@ -98,7 +98,7 @@
                 $("#div1").hide();
                 $("#div3").hide();
                 $("#ext1").iCheck("check");
-                //无合同，将第一个委托方设置为主委托方
+                //无合同，将第一个委托方设置为委托方
                 setTimeout(function () {
                     const ClientName = $("#workClientLinkmanList").find("tr").eq(0).find("td").eq(1).children("input").val().trim();
                     $("#contractClientName").val(ClientName);
@@ -319,7 +319,7 @@
             var delFlag = $(prefix+"_delFlag");
             const clientId = $("#contractClientId").val();
             if(id.val() === clientId){
-                parent.layer.msg('主委托方不允许删除',{icon:5});
+                parent.layer.msg('委托方不允许删除',{icon:5});
                 return;
             }
             $(obj).parent().parent().remove();
@@ -417,7 +417,7 @@
                     </div>
                     <div id="div2">
                         <div class="layui-item layui-col-sm6 lw7">
-                            <label class="layui-form-label">主委托方：</label>
+                            <label class="layui-form-label">委托方：</label>
                             <div class="layui-input-block">
                                 <input path="projectMasterName" htmlEscape="false" readonly="true"
                                        id="contractClientName" name="workContractInfo.client.name"

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

@@ -292,7 +292,7 @@
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
-                <label class="layui-form-label">主委托方：</label>
+                <label class="layui-form-label">委托方：</label>
                 <div class="layui-input-block">
                     <input path="projectMasterName" htmlEscape="false"  readonly="true" id="contractClientName" name="workContractInfo.client.name" class="form-control layui-input" value="${projectRecordsAlter.workContractInfo.client.name}"/>
                 </div>

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

@@ -63,7 +63,7 @@
                                 </div>
                             </div>
                             <div class="layui-item layui-col-sm6 lw6">
-                                <label class="layui-form-label">主委托方：</label>
+                                <label class="layui-form-label">委托方：</label>
                                 <div class="layui-input-block">
                                     <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.workContractInfo.client.name}"/>
                                 </div>
@@ -465,7 +465,7 @@
                             </div>
                         </div>
                         <div class="layui-item layui-col-sm6 lw6">
-                            <label class="layui-form-label">主委托方：</label>
+                            <label class="layui-form-label">委托方：</label>
                             <div class="layui-input-block">
                                 <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.alterBeforeRecords.workContractInfo.client.name}"/>
                             </div>

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

@@ -136,7 +136,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
 					</div>
@@ -166,7 +166,7 @@
                         <div class="input-group">
                             <form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
                             <span class="input-group-btn">
-                                <label class="form-status"><c:choose><c:when test="${not empty projectRecords.projectStatus}">${fns:getDictLabel(projectRecords.projectStatus, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
+                                <label class="form-status"><c:choose><c:when test="${not empty projectRecords.projectStatus}">${fns:getDictLabel(projectRecords.projectStatus, 'rural_project_audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
                              </span>
                         </div>
 					</div>

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

@@ -240,7 +240,7 @@
 							</div>
 						</div>
 						<div class="layui-item query athird">
-							<label class="layui-form-label">主委托方：</label>
+							<label class="layui-form-label">委托方：</label>
 							<div class="layui-input-block">
 								<form:input path="workContractInfo.client.name" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
@@ -364,7 +364,7 @@
                 ,{field:'contractNumber', align:'center',title: '合同编号',width:200}
                 ,{field:'contractName', align:'center',title: '合同名称',width:200}
                 ,{field:'contractAmt', align:'center',title: '合同金额(元)',width:100}
-                ,{field:'clientName',align:'center', title: '主委托方',width:200}
+                ,{field:'clientName',align:'center', title: '委托方',width:200}
                 ,{field:'contractType',align:'center', title: '工程分类',width:100}
                 ,{field:'scaleType',align:'center', title: '规模类型',width:100}
                 ,{field:'scaleUnit',align:'center', title: '规模单位',width:100}

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

@@ -35,7 +35,7 @@
     </style>
     <script type="text/javascript">
         var validateForm;
-        var isMasterClient = true;//是否是主委托方
+        var isMasterClient = true;//是否是委托方
         var clientCount = 0;
         function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
@@ -361,7 +361,7 @@
             // console.log("success==="+successRows);
             // console.log("clientCount==="+clientCount);
 
-            //如果主委托方还没有设置，则将第一个客户设置为主委托方
+            //如果委托方还没有设置，则将第一个客户设置为委托方
             if(obj[0].name != null){
                 if(isMasterClient){
                     $("#contractClientName").val(obj[0].clientId.name);
@@ -646,7 +646,7 @@
                    </div>
                    <div id="divv2">
                        <div class="layui-item layui-col-sm6 lw7">
-                           <label class="layui-form-label">主委托方：</label>
+                           <label class="layui-form-label">委托方：</label>
                            <div class="layui-input-block">
                                <input htmlEscape="false"  readonly="true" id="contractClientName" name="workContractInfo.client.name" class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.client.name}"/>
                            </div>

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

@@ -263,7 +263,7 @@
 							<div class="layui-input-block">
 								<form:select path="projectStatus" class=" form-control  simple-select">
 									<form:option value="" label=""/>
-									<form:options items="${fns:getDictList('audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+									<form:options items="${fns:getRuralDictList('rural_project_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
 							</div>
 						</div>
@@ -322,7 +322,7 @@
                 ,{field:'projMaster', align:'center',title: '负责人', width:65,templet:function(d){
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
                     }}
-                ,{field:'client',align:'center', title: '主委托方',  width:150,templet:function(d){
+                ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
@@ -354,7 +354,7 @@
                         }
                         if(d.candel != undefined && d.candel =="1")
                         {
-                            xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+                            xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要作废该项目信息吗？', this.href)\" class=\"op-btn op-btn-invalid\"><i class=\"fa fa-trash-o\"></i> 作废</a>";
                         }
                         if(d.cancancel != undefined && d.cancancel =="1")
                         {
@@ -364,6 +364,11 @@
                         {
                             //xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogre('项目变更管理', '${ctx}/ruralProject/ruralProjectRecordsAlter/form?alterBeforeRecords.id='+encodeURIComponent('" + d.id + "'),'95%','95%','','送审,暂存,关闭')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-edit\"></i> 变更</a>";
                         }
+                        if(d.deleteAdmin != undefined && d.deleteAdmin =="1")
+                        {
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/adminModify?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+							xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/adminDelete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+                        }
                         return xml;
 
                     }}
@@ -383,6 +388,7 @@
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectStatus":"${projectRecords.projectStatus}"
                     ,"procId":"${projectRecords.processInstanceId}"
+					,"flagAdmin":"${projectRecords.flagAdmin}"
                     <c:choose><c:when test="${flag == '1' or fns:getUser().id == projectRecords.createBy.id}">
                     <shiro:hasPermission name="ruralProject:ruralProjectRecords:del">,"candel":	<c:choose><c:when test="${(projectRecords.projectStatus == 1 or projectRecords.projectStatus == 3 or projectRecords.projectStatus == 4) && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
                     <shiro:hasPermission name="ruralProject:ruralProjectRecords:edit">,"canedit1":	<c:choose><c:when test="${projectRecords.projectStatus == 1 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
@@ -390,6 +396,7 @@
                     ,"canrecall":<c:choose><c:when test="${projectRecords.projectStatus == 3 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
                     </shiro:hasPermission>
                     ,"cancancel":<c:choose><c:when test="${projectRecords.projectStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+                    ,"deleteAdmin":<c:choose><c:when test="${'1' == projectRecords.flagAdmin && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
                     </c:when>
                     <c:otherwise>
                     ,"candel":"0"
@@ -397,6 +404,7 @@
                     ,"canedit2":"0"
                     ,"canrecall":"0"
                     ,"cancancel":"0"
+                    ,"deleteAdmin":"0"
                     </c:otherwise>
                     </c:choose>
                     <shiro:hasPermission name="ruralProject:ruralProjectRecords:edit">,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>

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

@@ -398,7 +398,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">主委托方：</label>
+                    <label class="layui-form-label">委托方：</label>
                     <div class="layui-input-block">
                         <input  htmlEscape="false"  readonly="true" id="contractClientName" name="workContractInfo.client.name" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
                     </div>
@@ -425,7 +425,7 @@
                         <div class="input-group">
                             <form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
                             <span class="input-group-btn">
-                                <label class="form-status"><c:choose><c:when test="${not empty projectRecords.projectStatus}">${fns:getDictLabel(projectRecords.projectStatus, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
+                                <label class="form-status"><c:choose><c:when test="${not empty projectRecords.projectStatus}">${fns:getDictLabel(projectRecords.projectStatus, 'rural_project_audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
                              </span>
                         </div>
                     </div>

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

@@ -94,7 +94,7 @@
 				   </div>
 			   </div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
 					</div>
@@ -123,7 +123,7 @@
                         <div class="input-group">
                             <form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
                             <span class="input-group-btn">
-                                <label class="form-status"><c:choose><c:when test="${not empty projectRecords.projectStatus}">${fns:getDictLabel(projectRecords.projectStatus, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
+                                <label class="form-status"><c:choose><c:when test="${not empty projectRecords.projectStatus}">${fns:getDictLabel(projectRecords.projectStatus, 'rural_project_audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
                              </span>
                         </div>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageForm.jsp

@@ -22,7 +22,7 @@
     </style>
     <script type="text/javascript">
         var validateForm;
-        var isMasterClient = true;//是否是主委托方
+        var isMasterClient = true;//是否是委托方
         var clientCount = 0;
         function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
@@ -256,7 +256,7 @@
             // console.log("success==="+successRows);
             // console.log("clientCount==="+clientCount);
 
-            //如果主委托方还没有设置，则将第一个客户设置为主委托方
+            //如果委托方还没有设置，则将第一个客户设置为委托方
             if(obj[0].name != null){
                 if(isMasterClient){
                     $("#contractClientName").val(obj[0].clientId.name);
@@ -494,7 +494,7 @@
                    </div>
                    <div id="divv2">
                        <div class="layui-item layui-col-sm6 lw7">
-                           <label class="layui-form-label">主委托方：</label>
+                           <label class="layui-form-label">委托方：</label>
                            <div class="layui-input-block">
                                <input htmlEscape="false"  readonly="true" id="contractClientName" name="workContractInfo.client.name" class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.client.name}"/>
                            </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -292,7 +292,7 @@
                 ,{field:'projMaster', align:'center',title: '负责人', width:65,templet:function(d){
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
                     }}
-                ,{field:'client',align:'center', title: '主委托方',  width:150,templet:function(d){
+                ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
@@ -401,46 +401,46 @@
                     <c:choose>
                         <c:when test="${fn:contains(projectRecords.leaderIds,fns:getUser().id)}">
                             ,"canAdd":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 0 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 0 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
                             ,"canedit1":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 1 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 1 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
                             ,"canedit2":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 4 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 4 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
                             ,"canrecall":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 3 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 3 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
 
                             ,"cancancel":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 2 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
 
                             <%-- 归档状态 --%>
                             ,"recordAdd":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 0 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 0 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordedit1":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 1 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 1 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordedit2":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 4 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 4 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordrecall":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 3 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 3 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordcancel":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 2 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
                             <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                         </c:when>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageModify.jsp

@@ -294,7 +294,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">主委托方：</label>
+                    <label class="layui-form-label">委托方：</label>
                     <div class="layui-input-block">
                         <input  htmlEscape="false"  readonly="true" id="contractClientName" name="workContractInfo.client.name" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageView.jsp

@@ -94,7 +94,7 @@
 				   </div>
 			   </div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
 					</div>

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

@@ -76,7 +76,7 @@
 								<th>项目名称</th>
 								<th>项目编号</th>
 								<th>负责人</th>
-								<th>主委托方</th>
+								<th>委托方</th>
 							</c:forEach>
 						</tr>
 					</thead>

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

@@ -137,7 +137,7 @@
 						<th width="15%" style="text-align: center">项目名称</th>
 						<th style="text-align: center">项目编号</th>
 						<th style="text-align: center">负责人</th>
-						<th width="30%" style="text-align: center">主委托方</th>
+						<th width="30%" style="text-align: center">委托方</th>
 					</tr>
 					</thead>
 					<tbody>

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

@@ -92,7 +92,7 @@
 						<th>合同名称</th>
 						<th >合同编号</th>
 						<th >工程分类</th>
-						<th >主委托方</th>
+						<th >委托方</th>
 						<th >签订日期</th>
 					</tr>
 					</thead>

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

@@ -76,7 +76,7 @@
 							<th>项目名称</th>
 							<th>项目编号</th>
 							<th>合同名称</th>
-							<th>主委托方</th>
+							<th>委托方</th>
 						</c:forEach>
 					</tr>
 					</thead>

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

@@ -96,7 +96,7 @@
 					<th>报告日期</th>
 					<th>合同编号</th>
 					<th>合同名称</th>
-					<th>主委托方</th>
+					<th>委托方</th>
 					<th>项目名称</th>
 					<th>项目编号</th>
 			</tr>

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

@@ -1128,7 +1128,7 @@
                                             <thead>
                                             <tr>
                                                 <th width="20%">项目名称</th>
-                                                <th width="15%">主委托方</th>
+                                                <th width="15%">委托方</th>
                                                 <th width="15%">工程分类</th>
                                                 <th width="15%">规模类型/单位/数量</th>
                                                 <th width="15%">担任职务</th>

src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowAudit.jsp

@@ -91,7 +91,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractBorrow.workContractInfo.client.name}"/>
 					</div>

src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowForm.jsp

@@ -88,7 +88,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<form:input id="cName" path="workContractInfo.client.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
 					</div>

src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowModify.jsp

@@ -99,7 +99,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<form:input id="cName" path="workContractInfo.client.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
 					</div>

src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowView.jsp

@@ -105,7 +105,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.client.name}"/>
 					</div>

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

@@ -189,7 +189,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label lw9">主委托方：</label>
+					<label class="layui-form-label lw9">委托方：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
 					</div>

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

@@ -129,7 +129,7 @@
 									</div>
 								</div>
 								<div class="layui-item layui-col-sm6">
-									<label class="layui-form-label lw9">主委托方：</label>
+									<label class="layui-form-label lw9">委托方：</label>
 									<div class="layui-input-block">
 										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
 									</div>

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

@@ -187,7 +187,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label lw9">主委托方：</label>
+					<label class="layui-form-label lw9">委托方：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
 					</div>

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

@@ -143,7 +143,7 @@
                                     </div>
                                 </div>
                                 <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label lw9">主委托方：</label>
+                                    <label class="layui-form-label lw9">委托方：</label>
                                     <div class="layui-input-block">
                                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
                                     </div>

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

@@ -143,7 +143,7 @@
                                     </div>
                                 </div>
                                 <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label lw9">主委托方：</label>
+                                    <label class="layui-form-label lw9">委托方：</label>
                                     <div class="layui-input-block">
                                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
                                     </div>

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

@@ -144,7 +144,7 @@
             var clientId = $("#clientId").val();
             console.log(id.val()+"-----------"+clientId);
             if(id.val() == clientId){
-				top.layer.msg("主委托方不允许删除",{icon:2});
+				top.layer.msg("委托方不允许删除",{icon:2});
                 return;
             }
             if (id.val() == "") {
@@ -636,7 +636,7 @@
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label"><span class="require-item">*</span>主委托方：</label>
+								<label class="layui-form-label"><span class="require-item">*</span>委托方：</label>
 								<div class="layui-input-block with-icon" style="margin-right:95px;">
 									<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${workContractInfo.client.id}"  title="选择客户" labelName="client.name"
 														  labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>

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

@@ -135,7 +135,7 @@
             var clientId = $("#clientId").val();
             console.log(id.val()+"-----------"+clientId);
             if(id.val() == clientId){
-                parent.layer.msg('主委托方不允许删除',{icon:5});
+                parent.layer.msg('委托方不允许删除',{icon:5});
                 return;
 			}
             if (id.val() == "") {
@@ -618,7 +618,7 @@
                 </div>
             </div>
             <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label"><span class="require-item">*</span>主委托方：</label>
+                <label class="layui-form-label"><span class="require-item">*</span>委托方：</label>
                 <div class="layui-input-block with-icon" style="margin-right:95px;">
                     <sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${workContractInfo.client.id}"  title="选择客户" labelName="client.name"
                                           labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>

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

@@ -162,7 +162,7 @@
             var clientId = $("#clientId").val();
             console.log(id.val()+"-----------"+clientId);
             if(id.val() == clientId){
-				top.layer.msg("主委托方不允许删除",{icon:2});
+				top.layer.msg("委托方不允许删除",{icon:2});
                 return;
             }
             if (id.val() == "") {
@@ -655,7 +655,7 @@
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label"><span class="require-item">*</span>主委托方：</label>
+								<label class="layui-form-label"><span class="require-item">*</span>委托方：</label>
 								<div class="layui-input-block with-icon" style="margin-right:95px;">
 									<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${workContractInfo.client.id}"  title="选择客户" labelName="client.name"
 														  labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>

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

@@ -135,7 +135,7 @@
             var clientId = $("#clientId").val();
             console.log(id.val()+"-----------"+clientId);
             if(id.val() == clientId){
-                parent.layer.msg('主委托方不允许删除');
+                parent.layer.msg('委托方不允许删除');
                 return;
             }
             if (id.val() == "") {
@@ -605,7 +605,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label"><span class="require-item">*</span>主委托方：</label>
+							<label class="layui-form-label"><span class="require-item">*</span>委托方：</label>
 							<div class="layui-input-block with-icon" style="margin-right:95px;">
 								<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${workContractInfo.client.id}"  title="选择客户" labelName="client.name"
 													  labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>

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

@@ -135,7 +135,7 @@
             var clientId = $("#clientId").val();
             console.log(id.val()+"-----------"+clientId);
             if(id.val() == clientId){
-                parent.layer.msg('主委托方不允许删除');
+                parent.layer.msg('委托方不允许删除');
                 return;
             }
             if (id.val() == "") {
@@ -618,7 +618,7 @@
                 </div>
             </div>
             <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label"><span class="require-item">*</span>主委托方：</label>
+                <label class="layui-form-label"><span class="require-item">*</span>委托方：</label>
                 <div class="layui-input-block with-icon" style="margin-right:95px;">
                     <sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${workContractInfo.client.id}"  title="选择客户" labelName="client.name"
                                           labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>

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

@@ -202,7 +202,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label ">主委托方：</label>
+							<label class="layui-form-label ">委托方：</label>
 							<div class="layui-input-block">
 								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
 							</div>

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

@@ -106,7 +106,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label ">主委托方：</label>
+							<label class="layui-form-label ">委托方：</label>
 							<div class="layui-input-block">
 								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
 							</div>
@@ -535,7 +535,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label ">主委托方：</label>
+							<label class="layui-form-label ">委托方：</label>
 							<div class="layui-input-block">
 								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.oldWorkContractInfo.client.name}"/>
 							</div>

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

@@ -136,7 +136,7 @@
 									</div>
 								</div>
 								<div class="layui-item layui-col-sm6">
-									<label class="layui-form-label ">主委托方：</label>
+									<label class="layui-form-label ">委托方：</label>
 									<div class="layui-input-block">
 										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
 									</div>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordAudit.jsp

@@ -121,7 +121,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.client.name}"/>
 					</div>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordForm.jsp

@@ -112,7 +112,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<form:input id="cName" path="workContractInfo.client.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
 					</div>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordList.jsp

@@ -159,7 +159,7 @@
 
 						<div class="commonQuery lw8">
 							<div class="layui-item query athird">
-								<label class="layui-form-label">主委托方：</label>
+								<label class="layui-form-label">委托方：</label>
 								<div class="layui-input-block">
 									<form:input id="cName" path="workContractInfo.client.name" htmlEscape="false" class="form-control  layui-input"/>
 								</div>
@@ -270,7 +270,7 @@
                     ,{field:'contractName',align:'center', title: '合同名称',minWidth:160,templet:function(d){
                             return "<span title='"+ d.contractName +"'>" + d.contractName + "</span>";
                         }}
-                    ,{field:'client',align:'center', title: '主委托方',minWidth:160,templet:function(d){
+                    ,{field:'client',align:'center', title: '委托方',minWidth:160,templet:function(d){
                             return "<span title='"+ d.client +"'>" + d.client + "</span>";
                         }}
                     ,{field:'contractType', align:'center',title: '工程分类',width:90,templet:function(d){

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordModifyApply.jsp

@@ -119,7 +119,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<form:input id="cName" path="workContractInfo.client.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
 					</div>

src/main/webapp/webpage/modules/workcontractrecord/workContractView.jsp

@@ -105,7 +105,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.client.name}"/>
 					</div>

src/main/webapp/webpage/modules/workcontractsignature/workContractSignatureAudit.jsp

@@ -102,7 +102,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<form:input id="cName" path="workContractInfo.client.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
 					</div>

src/main/webapp/webpage/modules/workcontractsignature/workContractSignatureForm.jsp

@@ -85,7 +85,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<form:input id="cName" path="workContractInfo.client.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
 					</div>

src/main/webapp/webpage/modules/workcontractsignature/workContractSignatureList.jsp

@@ -252,7 +252,7 @@
                 ,{field:'officeName',align:'center', title: '所属部门',minWidth:160,templet:function(d){
                         return "<span title='"+ d.officeName +"'>" + d.officeName + "</span>";
                     }}
-                ,{field:'client',align:'center', title: '主委托方',minWidth:160,templet:function(d){
+                ,{field:'client',align:'center', title: '委托方',minWidth:160,templet:function(d){
                         return "<span title='"+ d.client +"'>" + d.client + "</span>";
                     }}
                 ,{field:'client',align:'center', title: '对方合同编号',minWidth:160,templet:function(d){

src/main/webapp/webpage/modules/workcontractsignature/workContractSignatureModifyApply.jsp

@@ -96,7 +96,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<form:input id="cName" path="workContractInfo.client.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
 					</div>

src/main/webapp/webpage/modules/workcontractsignature/workContractSignatureView.jsp

@@ -84,7 +84,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">主委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
 						<form:input id="cName" path="workContractInfo.client.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
 					</div>