Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/downloadType/importWordApprovalForm.jsp

@@ -10,6 +10,7 @@
 		   $("#inputForm").submit();
 		  return true;
 		}
+
         var validateForm;
 		$(document).ready(function() {
 		    if( $("#id").val()!=null&& $("#id").val()!=''){
@@ -43,7 +44,21 @@
 				<div class="layui-item layui-col-sm12 ">
 					<input id="uploadFile" name="uploadFile" type="file" style="width:330px"/>导入文件不能超过5M，仅允许导入“doc”或“docx”格式文件！<br/>　
 				</div>
-			</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>负责人：</label>
+					<div class="layui-input-block  ">
+						<sys:reportedtreeselectUserZXY id="principalUserId" name="principalUserId" value="" labelName="principalUserName" labelValue=""
+										cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label "><span class="require-item">*</span>总经理：</label>
+					<div class="layui-input-block ">
+						<sys:reportedtreeselectUser id="generalManagerUserId" name="generalManagerUserId" value="" labelName="generalManagerUserName" labelValue=""
+										cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+					</div>
+				</div>
+
 		</form:form>
 	</div>
 </div>