合同添加客户部分信息

src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractInfo.java

@@ -63,6 +63,12 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	private String clientName;		// 主委托方名称
 	private String telephone;
 	private String uscCode;
+	private String address;		//客户地址
+	private String ourBank;		//开户银行
+	private String bankNumber;	//银行账号
+
+
+
 	private Area area;		// 地区Id
 	private Integer hasUscc; //是否拥有统一社会信用代码
 	private WorkClientInfo workClientInfo; //客户管理
@@ -1280,4 +1286,28 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public void setOverDueStatus(String overDueStatus) {
 		this.overDueStatus = overDueStatus;
 	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public String getOurBank() {
+		return ourBank;
+	}
+
+	public void setOurBank(String ourBank) {
+		this.ourBank = ourBank;
+	}
+
+	public String getBankNumber() {
+		return bankNumber;
+	}
+
+	public void setBankNumber(String bankNumber) {
+		this.bankNumber = bankNumber;
+	}
 }

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

@@ -1228,10 +1228,12 @@ public class WorkContractInfoController extends BaseController {
 
 
             //查询合同编号是否在数据库中已存在。若存在，则进行抛出
-            WorkContractInfo contractInfoByNum = workContractInfoService.getContractInfoByNum(workContractInfo);//从数据库取出记录的值
-            if(null != contractInfoByNum){
-                addMessage(redirectAttributes, "合同编号已存在，无法进行添加");
-                return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
+            if(StringUtils.isNotBlank(workContractInfo.getContractNum())){
+                WorkContractInfo contractInfoByNum = workContractInfoService.getContractInfoByNum(workContractInfo);//从数据库取出记录的值
+                if(null != contractInfoByNum){
+                    addMessage(redirectAttributes, "合同编号已存在，无法进行添加");
+                    return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
+                }
             }
 
             List<WorkClientAttachment> list = workContractInfo.getWorkAttachments();

src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoDao.xml

@@ -66,6 +66,9 @@
 		a.office_id AS "officeId",
 		a.uscCode AS "uscCode",
 		a.hasUscc  AS "hasUscc"
+		a.address  AS "address",
+		a.our_bank  AS "ourBank",
+		a.bank_number  AS "bankNumber",
 		(select count(1) from work_contract_info c where c.total_contract_id = a.id)  cnt,
 		a.contract_information AS "contractInformation",
 		a.describe_content AS "describeContent",
@@ -125,6 +128,9 @@
 		a.telephone AS "telephone",
 		a.uscCode AS "uscCode",
 		a.hasUscc  AS "hasUscc",
+		a.address  AS "address",
+		a.our_bank  AS "ourBank",
+		a.bank_number  AS "bankNumber",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -189,6 +195,9 @@
 		a.telephone AS "telephone",
 		a.uscCode AS "uscCode",
 		a.hasUscc  AS "hasUscc",
+		a.address  AS "address",
+		a.our_bank  AS "ourBank",
+		a.bank_number  AS "bankNumber",
 		a.clientName AS "clientName",
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
@@ -259,6 +268,9 @@
 		a.telephone AS "telephone",
 		a.uscCode AS "uscCode",
 		a.hasUscc  AS "hasUscc",
+		a.address  AS "address",
+		a.our_bank  AS "ourBank",
+		a.bank_number  AS "bankNumber",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -475,6 +487,9 @@
 		a.telephone AS "telephone",
 		a.uscCode AS "uscCode",
 		a.hasUscc  AS "hasUscc",
+		a.address  AS "address",
+		a.our_bank  AS "ourBank",
+		a.bank_number  AS "bankNumber",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -577,6 +592,9 @@
 		a.telephone AS "telephone",
 		a.uscCode AS "uscCode",
 		a.hasUscc  AS "hasUscc",
+		a.address  AS "address",
+		a.our_bank  AS "ourBank",
+		a.bank_number  AS "bankNumber",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -702,6 +720,9 @@
 		a.telephone AS "telephone",
 		a.uscCode AS "uscCode",
 		a.hasUscc  AS "hasUscc",
+		a.address  AS "address",
+		a.our_bank  AS "ourBank",
+		a.bank_number  AS "bankNumber",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -827,6 +848,9 @@
 		a.telephone AS "telephone",
 		a.uscCode AS "uscCode",
 		a.hasUscc  AS "hasUscc",
+		a.address  AS "address",
+		a.our_bank  AS "ourBank",
+		a.bank_number  AS "bankNumber",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -975,7 +999,10 @@
 			clientName,
 			telephone,
 			uscCode,
-			hasUscc
+			hasUscc,
+			address,
+			our_bank,
+			bank_number
 		) VALUES (
 			#{id},
 			#{project.id},
@@ -1039,7 +1066,10 @@
 			#{clientName},
 			#{telephone},
 			#{uscCode},
-			#{hasUscc}
+			#{hasUscc},
+			#{address},
+			#{ourBank},
+			#{bankNumber}
 		)
 	</insert>
 
@@ -1059,6 +1089,9 @@
 			telephone = #{telephone},
 			uscCode = #{uscCode},
 			hasUscc =#{hasUscc},
+			address =#{address},
+			our_bank =#{ourBank},
+			bank_number =#{bankNumber},
 			contract_category = #{contractCategory},
 			contract_num = #{contractNum},
 			contract_price = #{contractPrice},
@@ -1327,6 +1360,9 @@
 		a.telephone AS "telephone",
 		a.uscCode AS "uscCode",
 		a.hasUscc  AS "hasUscc",
+		a.address  AS "address",
+		a.our_bank  AS "ourBank",
+		a.bank_number  AS "bankNumber",
 		a.contractTypeDoc,
 		a.contractFeeDoc,
 		a.charge_company_name AS "chargeCompanyName",
@@ -1487,6 +1523,9 @@
 		a.telephone AS "telephone",
 		a.uscCode AS "uscCode",
 		a.hasUscc  AS "hasUscc",
+		a.address  AS "address",
+		a.our_bank  AS "ourBank",
+		a.bank_number  AS "bankNumber",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -1564,6 +1603,9 @@
 		a.telephone AS "telephone",
 		a.uscCode AS "uscCode",
 		a.hasUscc  AS "hasUscc",
+		a.address  AS "address",
+		a.our_bank  AS "ourBank",
+		a.bank_number  AS "bankNumber",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -1593,8 +1635,12 @@
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
 		LEFT JOIN work_contract_record wcr ON wcr.contract_info_id = a.id
-		WHERE a.contract_num = #{contractNum}
-		and a.id != #{id}
+		<where >
+			<if test="contractNum != null and contractNum != ''">
+				and a.contract_num = #{contractNum}
+			</if>
+			and a.id != #{id}
+		</where>
 		order by a.id
 		limit 1
 	</select>
@@ -1666,6 +1712,9 @@ UPDATE work_client_linkman SET
 		a.telephone AS "telephone",
 		a.uscCode AS "uscCode",
 		a.hasUscc  AS "hasUscc",
+		a.address  AS "address",
+		a.our_bank  AS "ourBank",
+		a.bank_number  AS "bankNumber",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",

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

@@ -60,17 +60,33 @@
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line">拥有统一社会信用代码：</label>
+                        <br>
+                        <label class="layui-form-label double-line">统一社会信用代码：</label>
                         <div class="layui-input-block">
-                            <input type="radio" name="hasUscc" value="1" title="是" disabled <c:if test="${workContractInfo.hasUscc=='1'}">checked</c:if>>
-                            <input type="radio" name="hasUscc" value="2" title="否" disabled <c:if test="${workContractInfo.hasUscc=='2'}">checked</c:if> >
+                            <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.uscCode}"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <br>
-                        <label class="layui-form-label double-line">统一社会信用代码：</label>
+                        <label class="layui-form-label">公司地址：</label>
                         <div class="layui-input-block">
-                            <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.uscCode}"/>
+                            <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.address}"/>
+                        </div>
+                    </div>
+
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <br>
+                        <label class="layui-form-label">开户银行：</label>
+                        <div class="layui-input-block">
+                            <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.ourBank}"/>
+                        </div>
+                    </div>
+
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <br>
+                        <label class="layui-form-label">银行账号：</label>
+                        <div class="layui-input-block">
+                            <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.bankNumber}"/>
                         </div>
                     </div>
                 </div>

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

@@ -701,20 +701,36 @@
 
 									</div>
 								</div>
+								<div class="layui-item layui-col-sm6 lw7 ">
+									<br>
+									<label class="layui-form-label double-line">统一社会信用代码：</label>
+									<div class="layui-input-block">
+										<form:input path="uscCode" placeholder="请输入统一社会信用代码" htmlEscape="false" id="uscCode"   class="form-control isUscCode layui-input"/>
+										<input type="hidden" id="oldUscCode" value=""/>
+										<span id="uscPh" style="color:#cc5965"></span>
+									</div>
+								</div>
+								<div class="layui-item layui-col-sm6 lw7">
+									<br>
+									<label class="layui-form-label">公司地址：</label>
+									<div class="layui-input-block">
+										<form:input path="address" placeholder="请输入公司地址" htmlEscape="false" id="telephone" class="form-control layui-input"/>
+									</div>
+								</div>
+
 								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label double-line"><span class="require-item">*</span>拥有统一社会信用代码：</label>
-									<div class="layui-input-block">&nbsp;&nbsp;
-										<input type="radio" name="hasUscc" value="1" title="是"  lay-filter="hasUscc" <c:if test="${workContractInfo.hasUscc=='1'}">checked</c:if>>
-										<input type="radio" name="hasUscc" value="2" title="否"  lay-filter="hasUscc" <c:if test="${workContractInfo.hasUscc=='2'}">checked</c:if> >
+									<br>
+									<label class="layui-form-label">开户银行：</label>
+									<div class="layui-input-block">
+										<form:input path="ourBank" placeholder="请输入开户银行" htmlEscape="false" id="telephone" class="form-control layui-input"/>
 									</div>
 								</div>
-								<div class="layui-item layui-col-sm6 lw7 companyType_uscCode">
+
+								<div class="layui-item layui-col-sm6 lw7">
 									<br>
-									<label class="layui-form-label double-line"><span class="require-item">*</span>统一社会信用代码：</label>
+									<label class="layui-form-label">银行账号：</label>
 									<div class="layui-input-block">
-										<form:input path="uscCode" placeholder="请输入统一社会信用代码" htmlEscape="false" id="uscCode"   class="form-control judgment isUscCode layui-input"/>
-										<input type="hidden" id="oldUscCode" value=""/>
-										<span id="uscPh" style="color:#cc5965"></span>
+										<form:input path="bankNumber" placeholder="请输入银行账号" htmlEscape="false" id="telephone" class="form-control number layui-input"/>
 									</div>
 								</div>
 							</div>

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

@@ -615,18 +615,12 @@
 
 									</div>
 								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label double-line"><span class="require-item">*</span>拥有统一社会信用代码：</label>
-									<div class="layui-input-block">&nbsp;&nbsp;
-										<form:radiobutton id="hasUscc" class="" name="hasUscc" path="" lay-filter="hasUscc" value="1" label="是" checked="true" />
-										<form:radiobutton id="hasUscc" class="" name="hasUscc" path="" lay-filter="hasUscc" value="2" label="否" />
-									</div>
-								</div>
+
 								<div class="layui-item layui-col-sm6 lw7 companyType_uscCode">
 									<br>
-									<label class="layui-form-label double-line"><span class="require-item">*</span>统一社会信用代码：</label>
+									<label class="layui-form-label double-line">统一社会信用代码：</label>
 									<div class="layui-input-block">
-										<form:input path="uscCode" placeholder="请输入统一社会信用代码" htmlEscape="false" id="uscCode"   class="form-control required isUscCode layui-input"/>
+										<form:input path="uscCode" placeholder="请输入统一社会信用代码" htmlEscape="false" id="uscCode"   class="form-control isUscCode layui-input"/>
 										<input type="hidden" id="oldUscCode" value=""/>
 										<span id="uscPh" style="color:#cc5965"></span>
 									</div>

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

@@ -701,22 +701,40 @@
 
 									</div>
 								</div>
+
 								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label double-line"><span class="require-item">*</span>拥有统一社会信用代码：</label>
-									<div class="layui-input-block">&nbsp;&nbsp;
-										<input type="radio" name="hasUscc" value="1" title="是"  lay-filter="hasUscc" <c:if test="${workContractInfo.hasUscc=='1'}">checked</c:if>>
-										<input type="radio" name="hasUscc" value="2" title="否"  lay-filter="hasUscc" <c:if test="${workContractInfo.hasUscc=='2'}">checked</c:if> >
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7 companyType_uscCode">
 									<br>
-									<label class="layui-form-label double-line"><span class="require-item">*</span>统一社会信用代码：</label>
+									<label class="layui-form-label double-line">统一社会信用代码：</label>
 									<div class="layui-input-block">
-										<form:input path="uscCode" placeholder="请输入统一社会信用代码" htmlEscape="false" id="uscCode"   class="form-control judgment isUscCode layui-input"/>
+										<form:input path="uscCode" placeholder="请输入统一社会信用代码" htmlEscape="false" id="uscCode"   class="form-control isUscCode layui-input"/>
 										<input type="hidden" id="oldUscCode" value=""/>
 										<span id="uscPh" style="color:#cc5965"></span>
 									</div>
 								</div>
+
+								<div class="layui-item layui-col-sm6 lw7">
+									<br>
+									<label class="layui-form-label">公司地址：</label>
+									<div class="layui-input-block">
+										<form:input path="address" placeholder="请输入公司地址" htmlEscape="false" id="telephone" class="form-control layui-input"/>
+									</div>
+								</div>
+
+								<div class="layui-item layui-col-sm6 lw7">
+									<br>
+									<label class="layui-form-label">开户银行：</label>
+									<div class="layui-input-block">
+										<form:input path="ourBank" placeholder="请输入开户银行" htmlEscape="false" id="telephone" class="form-control layui-input"/>
+									</div>
+								</div>
+
+								<div class="layui-item layui-col-sm6 lw7">
+									<br>
+									<label class="layui-form-label">银行账号：</label>
+									<div class="layui-input-block">
+										<form:input path="bankNumber" placeholder="请输入银行账号" htmlEscape="false" id="telephone" maxlength="25" class="form-control number layui-input"/>
+									</div>
+								</div>
 							</div>
 						</div>
 					</div>

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

@@ -148,19 +148,36 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw7">
-							<label class="layui-form-label double-line">拥有统一社会信用代码：</label>
+							<br>
+							<label class="layui-form-label double-line">统一社会信用代码：</label>
 							<div class="layui-input-block">
-								<input type="radio" name="hasUscc" value="1" title="是" disabled <c:if test="${workContractInfo.hasUscc=='1'}">checked</c:if>>
-								<input type="radio" name="hasUscc" value="2" title="否" disabled <c:if test="${workContractInfo.hasUscc=='2'}">checked</c:if> >
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.uscCode}"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw7">
 							<br>
-							<label class="layui-form-label double-line">统一社会信用代码：</label>
+							<label class="layui-form-label">公司地址：</label>
 							<div class="layui-input-block">
-								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.uscCode}"/>
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.address}"/>
+							</div>
+						</div>
+
+						<div class="layui-item layui-col-sm6 lw7">
+							<br>
+							<label class="layui-form-label">开户银行：</label>
+							<div class="layui-input-block">
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.ourBank}"/>
 							</div>
 						</div>
+
+						<div class="layui-item layui-col-sm6 lw7">
+							<br>
+							<label class="layui-form-label">银行账号：</label>
+							<div class="layui-input-block">
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.bankNumber}"/>
+							</div>
+						</div>
+
 					</div>
 
 				</div>

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

@@ -123,14 +123,59 @@
 			<form:hidden id="flag" path="act.flag"/>
 			<sys:message content="${message}"/>
 			<input type="hidden" id="opinion" name="act.comment" value="" maxlength="250">
-			<div class="form-group layui-row first lw8">
-				<div class="form-group-label"><h2>基础信息</h2></div>
-				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">客户名称：</label>
-					<div class="layui-input-block">
-						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.clientName}"/>
+			<div id="tab-12" class="tab-pane active">
+				<div class="form-group-label"><h2>客户基础信息</h2>
+					<div class="layui-item layui-col-sm6 lw7">
+						<br>
+						<label class="layui-form-label">客户名称：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.clientName}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw7">
+						<br>
+						<label class="layui-form-label">公司电话：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.telephone}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw7">
+						<br>
+						<label class="layui-form-label double-line">统一社会信用代码：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.uscCode}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw7">
+						<br>
+						<label class="layui-form-label">公司地址：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.address}"/>
+						</div>
+					</div>
+
+					<div class="layui-item layui-col-sm6 lw7">
+						<br>
+						<label class="layui-form-label">开户银行：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.ourBank}"/>
+						</div>
 					</div>
+
+					<div class="layui-item layui-col-sm6 lw7">
+						<br>
+						<label class="layui-form-label">银行账号：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.bankNumber}"/>
+						</div>
+					</div>
+
 				</div>
+
+			</div>
+
+			<div class="form-group layui-row first lw8">
+				<div class="form-group-label"><h2>基础信息</h2></div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同名称：</label>
 					<div class="layui-input-block with-icon">
@@ -156,12 +201,6 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label ">合同类型：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractRecord.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
 					<div class="layui-input-block">
 						<input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" disabled id="jine" value="0" <c:if test="${workContractRecord.workContractInfo.contractInformation=='0'}">checked</c:if>>
@@ -169,9 +208,9 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label double-line">合同金额(元)预计金额：</label>
+					<label class="layui-form-label ">合同类型：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" id="contractPrice" readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workContractRecord.workContractInfo.contractPrice}" pattern="#,#00.00"/>"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractRecord.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -182,6 +221,12 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label double-line">合同金额(元)预计金额：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" id="contractPrice" readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workContractRecord.workContractInfo.contractPrice}" pattern="#,#00.00"/>"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label ">对方合同编号：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.anotherContractNum}"/>

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

@@ -141,6 +141,67 @@
 			<form:hidden id="flag" path="act.flag"/>
 			<input type="hidden" id="ext" name="ext" value="1">
 			<input type="hidden" id="chargeCriterionH" value="${workContractRecord.workContractInfo.chargeCriterion}">
+
+
+			<div id="tab-12" class="tab-pane active">
+				<div class="form-group layui-row first lw9">
+					<div class="form-group-label"><h2>客户基础信息</h2>
+						<div class="layui-item layui-col-sm6 lw7" id="">
+							<br>
+							<label class="layui-form-label"><span class="require-item">*</span>客户名称：&nbsp;&nbsp;</label>
+							<div class="layui-input-block">
+								<form:input path="workContractInfo.clientName" placeholder="请输入客户名称" htmlEscape="false" id=""  class="form-control judgment layui-input"/>
+								<span id="ph" style="color:#cc5965"></span>
+							</div>
+							<div id="fuzzyQuerySelect"
+								 style="z-index:1;display:none;background-color:white; position: absolute; width:333px;left:120px; border: 1px solid gray;">
+							</div>
+						</div>
+
+						<div class="layui-item layui-col-sm6 lw7">
+							<br>
+							<label class="layui-form-label"><span class="require-item">*</span>公司电话：</label>
+							<div class="layui-input-block">
+								<form:input path="workContractInfo.telephone" placeholder="请输入公司电话" htmlEscape="false" id="telephone" class="form-control judgment layui-input"/>
+
+							</div>
+						</div>
+						<div class="layui-item layui-col-sm6 lw7 ">
+							<br>
+							<label class="layui-form-label double-line">统一社会信用代码：</label>
+							<div class="layui-input-block">
+								<form:input path="workContractInfo.uscCode" placeholder="请输入统一社会信用代码" htmlEscape="false" id="uscCode"   class="form-control isUscCode layui-input"/>
+								<input type="hidden" id="oldUscCode" value=""/>
+								<span id="uscPh" style="color:#cc5965"></span>
+							</div>
+						</div>
+						<div class="layui-item layui-col-sm6 lw7">
+							<br>
+							<label class="layui-form-label">公司地址：</label>
+							<div class="layui-input-block">
+								<form:input path="workContractInfo.address" placeholder="请输入公司地址" htmlEscape="false" id="telephone" class="form-control layui-input"/>
+							</div>
+						</div>
+
+						<div class="layui-item layui-col-sm6 lw7">
+							<br>
+							<label class="layui-form-label">开户银行：</label>
+							<div class="layui-input-block">
+								<form:input path="workContractInfo.ourBank" placeholder="请输入开户银行" htmlEscape="false" id="telephone" class="form-control layui-input"/>
+							</div>
+						</div>
+
+						<div class="layui-item layui-col-sm6 lw7">
+							<br>
+							<label class="layui-form-label">银行账号：</label>
+							<div class="layui-input-block">
+								<form:input path="workContractInfo.bankNumber" placeholder="请输入银行账号" htmlEscape="false" id="telephone" class="form-control number layui-input"/>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>基础信息</h2></div>
 				<%--<div class="layui-item layui-col-sm6">

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

@@ -127,6 +127,29 @@
 							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.uscCode}"/>
 						</div>
 					</div>
+					<div class="layui-item layui-col-sm6 lw7">
+						<br>
+						<label class="layui-form-label">公司地址：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.address}"/>
+						</div>
+					</div>
+
+					<div class="layui-item layui-col-sm6 lw7">
+						<br>
+						<label class="layui-form-label">开户银行：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.ourBank}"/>
+						</div>
+					</div>
+
+					<div class="layui-item layui-col-sm6 lw7">
+						<br>
+						<label class="layui-form-label">银行账号：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.bankNumber}"/>
+						</div>
+					</div>
 				</div>
 
 			</div>