Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/disputeMediation/projectNonPrelitigationMediation/projectNonPrelitigationMediationDetail.jsp

@@ -145,13 +145,6 @@
                 </div>
                 <div class="item layui-row" style="display: none;">
                     <div class="form-group-label"><h2>附件信息</h2></div>
-                    <div class="layui-item nav-btns">
-                        <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-                        <sys:collectSelect  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
-                                            name="linkman.id"  title="选择资料库"
-                                            cssClass="form-control judgment" fieldLabels="资料库" fieldKeys="name"
-                                            searchLabel="资料库" searchKey="fileName"></sys:collectSelect>
-                    </div>
                     <div id="addFile_attachment" style="display: none" class="upload-progress">
                         <span id="fileName_attachment"></span>
                         <b><span id="baifenbi_attachment"></span></b>
@@ -324,7 +317,7 @@
                                                 </c:otherwise>
                                             </c:choose>
                                             <c:if test="${workClientAttachment.collectFlag != 1}">
-                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn layui-btn-warm" >&nbsp;收藏</a>
                                             </c:if>
                                         </div>
                                     </td>
@@ -337,13 +330,6 @@
                 <div class="item layui-row" style="display: none;">
                     <div class="form-group layui-row">
                         <div class="form-group-label"><h2>诉前调解案件反馈表</h2></div>
-                        <div class="layui-item nav-btns">
-                            <a id="attachment_btn1" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-                            <sys:collectSelect  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
-                                                name="linkman.id"  title="选择资料库"
-                                                cssClass="form-control judgment" fieldLabels="资料库" fieldKeys="name"
-                                                searchLabel="资料库" searchKey="fileName"></sys:collectSelect>
-                        </div>
                         <div id="addFile_attachment1" style="display: none" class="upload-progress">
                             <span id="fileName_attachment1"></span>
                             <b><span id="baifenbi_attachment1"></span></b>
@@ -517,7 +503,7 @@
                                                 </c:choose>
 
                                                 <c:if test="${workClientAttachment.collectFlag != 1}">
-                                                    <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                                    <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn layui-btn-warm" >&nbsp;收藏</a>
                                                 </c:if>
                                             </div>
                                         </td>
@@ -529,13 +515,6 @@
                     </div>
                     <div class="form-group layui-row">
                         <div class="form-group-label"><h2>专家意见(征求意见稿)</h2></div>
-                        <div class="layui-item nav-btns">
-                            <a id="attachment_btn2" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-                            <sys:collectSelect  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
-                                                name="linkman.id"  title="选择资料库"
-                                                cssClass="form-control judgment" fieldLabels="资料库" fieldKeys="name"
-                                                searchLabel="资料库" searchKey="fileName"></sys:collectSelect>
-                        </div>
                         <div id="addFile_attachment2" style="display: none" class="upload-progress">
                             <span id="fileName_attachment2"></span>
                             <b><span id="baifenbi_attachment2"></span></b>
@@ -709,7 +688,7 @@
                                                 </c:choose>
 
                                                 <c:if test="${workClientAttachment.collectFlag != 1}">
-                                                    <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                                    <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn layui-btn-warm" >&nbsp;收藏</a>
                                                 </c:if>
                                             </div>
                                         </td>

src/main/webapp/webpage/modules/disputeMediation/projectNonPrelitigationMediation/projectNonPrelitigationMediationForm.jsp

@@ -215,13 +215,13 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>调解组织：</label>
                         <div class="layui-input-block">
-                            <form:input placeholder="请输入调解组织" path="mediationOrganization" id="mediationOrganization" htmlEscape="false" class="form-control layui-input"/>
+                            <form:input placeholder="请输入调解组织" maxlength="64" path="mediationOrganization" id="mediationOrganization" htmlEscape="false" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>案号：</label>
                         <div class="layui-input-block">
-                            <form:input placeholder="请输入案号" path="caseNumber" id="caseNumber" htmlEscape="false" class="form-control layui-input"/>
+                            <form:input placeholder="请输入案号" maxlength="64" path="caseNumber" id="caseNumber" htmlEscape="false" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
@@ -239,7 +239,7 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>法院名称：</label>
                         <div class="layui-input-block">
-                            <form:input placeholder="请输入法院名称" path="courtName" id="courtName" htmlEscape="false" class="form-control layui-input"/>
+                            <form:input placeholder="请输入法院名称" maxlength="64" path="courtName" id="courtName" htmlEscape="false" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
@@ -255,26 +255,26 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>原告：</label>
                         <div class="layui-input-block">
-                            <form:input path="plaintiff" placeholder="请输入原告"  id="plaintiff" htmlEscape="false" class="form-control layui-input"/>
+                            <form:input path="plaintiff" placeholder="请输入原告" maxlength="64"  id="plaintiff" htmlEscape="false" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">调解配合度：</label>
                         <div class="layui-input-block">
                             <form:input path="mediationFit" id="mediationFit" htmlEscape="false"
-                                        placeholder="请输入调解配合度" class="form-control layui-input "/>
+                                        placeholder="请输入调解配合度" maxlength="64" class="form-control layui-input "/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">被告1：</label>
                         <div class="layui-input-block">
-                            <form:input placeholder="请输入被告1" path="defendantFirst" id="defendantFirst" htmlEscape="false" class="form-control layui-input"/>
+                            <form:input placeholder="请输入被告1" maxlength="64" path="defendantFirst" id="defendantFirst" htmlEscape="false" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">被告2：</label>
                         <div class="layui-input-block">
-                            <form:input placeholder="请输入被告2" path="defendantSecond" id="defendantSecond" htmlEscape="false" class="form-control layui-input"/>
+                            <form:input placeholder="请输入被告2" maxlength="64" path="defendantSecond" id="defendantSecond" htmlEscape="false" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm12 with-textarea">
@@ -492,7 +492,7 @@
                                                    class="op-btn op-btn-delete"><i class="fa fa-trash"></i>&nbsp;删除</a>
                                             </c:if>
                                             <c:if test="${workClientAttachment.collectFlag != 1}">
-                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn layui-btn-warm" >&nbsp;收藏</a>
                                             </c:if>
                                         </div>
                                     </td>
@@ -689,7 +689,7 @@
                                                        class="op-btn op-btn-delete"><i class="fa fa-trash"></i>&nbsp;删除</a>
                                                 </c:if>
                                                 <c:if test="${workClientAttachment.collectFlag != 1}">
-                                                    <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                                    <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn layui-btn-warm" >&nbsp;收藏</a>
                                                 </c:if>
                                             </div>
                                         </td>
@@ -885,7 +885,7 @@
                                                        class="op-btn op-btn-delete"><i class="fa fa-trash"></i>&nbsp;删除</a>
                                                 </c:if>
                                                 <c:if test="${workClientAttachment.collectFlag != 1}">
-                                                    <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                                    <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn layui-btn-warm" >&nbsp;收藏</a>
                                                 </c:if>
                                             </div>
                                         </td>

src/main/webapp/webpage/modules/disputeMediation/projectPrelitigationMediation/projectPrelitigationMediationDetail.jsp

@@ -145,13 +145,6 @@
                 </div>
                 <div class="item layui-row" style="display: none;">
                     <div class="form-group-label"><h2>附件信息</h2></div>
-                    <div class="layui-item nav-btns">
-                        <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-                        <sys:collectSelect  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
-                                            name="linkman.id"  title="选择资料库"
-                                            cssClass="form-control judgment" fieldLabels="资料库" fieldKeys="name"
-                                            searchLabel="资料库" searchKey="fileName"></sys:collectSelect>
-                    </div>
                     <div id="addFile_attachment" style="display: none" class="upload-progress">
                         <span id="fileName_attachment"></span>
                         <b><span id="baifenbi_attachment"></span></b>
@@ -324,7 +317,7 @@
                                                 </c:otherwise>
                                             </c:choose>
                                             <c:if test="${workClientAttachment.collectFlag != 1}">
-                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn layui-btn-warm" >&nbsp;收藏</a>
                                             </c:if>
                                         </div>
                                     </td>
@@ -337,13 +330,6 @@
                 <div class="item layui-row" style="display: none;">
                     <div class="form-group layui-row">
                         <div class="form-group-label"><h2>诉前调解案件反馈表</h2></div>
-                        <div class="layui-item nav-btns">
-                            <a id="attachment_btn1" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-                            <sys:collectSelect  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
-                                                name="linkman.id"  title="选择资料库"
-                                                cssClass="form-control judgment" fieldLabels="资料库" fieldKeys="name"
-                                                searchLabel="资料库" searchKey="fileName"></sys:collectSelect>
-                        </div>
                         <div id="addFile_attachment1" style="display: none" class="upload-progress">
                             <span id="fileName_attachment1"></span>
                             <b><span id="baifenbi_attachment1"></span></b>
@@ -517,7 +503,7 @@
                                                 </c:choose>
 
                                                 <c:if test="${workClientAttachment.collectFlag != 1}">
-                                                    <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                                    <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn layui-btn-warm" >&nbsp;收藏</a>
                                                 </c:if>
                                             </div>
                                         </td>
@@ -529,13 +515,6 @@
                     </div>
                     <div class="form-group layui-row">
                         <div class="form-group-label"><h2>专家意见(征求意见稿)</h2></div>
-                        <div class="layui-item nav-btns">
-                            <a id="attachment_btn2" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-                            <sys:collectSelect  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
-                                                name="linkman.id"  title="选择资料库"
-                                                cssClass="form-control judgment" fieldLabels="资料库" fieldKeys="name"
-                                                searchLabel="资料库" searchKey="fileName"></sys:collectSelect>
-                        </div>
                         <div id="addFile_attachment2" style="display: none" class="upload-progress">
                             <span id="fileName_attachment2"></span>
                             <b><span id="baifenbi_attachment2"></span></b>
@@ -709,7 +688,7 @@
                                                 </c:choose>
 
                                                 <c:if test="${workClientAttachment.collectFlag != 1}">
-                                                    <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                                    <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn layui-btn-warm" >&nbsp;收藏</a>
                                                 </c:if>
                                             </div>
                                         </td>

src/main/webapp/webpage/modules/disputeMediation/projectPrelitigationMediation/projectPrelitigationMediationForm.jsp

@@ -215,13 +215,13 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>调解组织：</label>
                         <div class="layui-input-block">
-                            <form:input placeholder="请输入调解组织" path="mediationOrganization" id="mediationOrganization" htmlEscape="false" class="form-control layui-input"/>
+                            <form:input placeholder="请输入调解组织" path="mediationOrganization" maxlength="64" id="mediationOrganization" htmlEscape="false" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>案号：</label>
                         <div class="layui-input-block">
-                            <form:input placeholder="请输入案号" path="caseNumber" id="caseNumber" htmlEscape="false" class="form-control layui-input"/>
+                            <form:input placeholder="请输入案号" path="caseNumber" maxlength="64" id="caseNumber" htmlEscape="false" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
@@ -239,7 +239,7 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>法院名称：</label>
                         <div class="layui-input-block">
-                            <form:input placeholder="请输入法院名称" path="courtName" id="courtName" htmlEscape="false" class="form-control layui-input"/>
+                            <form:input placeholder="请输入法院名称" maxlength="64" path="courtName" id="courtName" htmlEscape="false" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
@@ -255,26 +255,26 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>原告：</label>
                         <div class="layui-input-block">
-                            <form:input path="plaintiff" placeholder="请输入原告"  id="plaintiff" htmlEscape="false" class="form-control layui-input"/>
+                            <form:input path="plaintiff" placeholder="请输入原告" maxlength="64" id="plaintiff" htmlEscape="false" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">调解配合度：</label>
                         <div class="layui-input-block">
                             <form:input path="mediationFit" id="mediationFit" htmlEscape="false"
-                                        placeholder="请输入调解配合度" class="form-control layui-input "/>
+                                        placeholder="请输入调解配合度" maxlength="64" class="form-control layui-input "/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">被告1：</label>
                         <div class="layui-input-block">
-                            <form:input placeholder="请输入被告1" path="defendantFirst" id="defendantFirst" htmlEscape="false" class="form-control layui-input"/>
+                            <form:input placeholder="请输入被告1" maxlength="64" path="defendantFirst" id="defendantFirst" htmlEscape="false" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">被告2：</label>
                         <div class="layui-input-block">
-                            <form:input placeholder="请输入被告2" path="defendantSecond" id="defendantSecond" htmlEscape="false" class="form-control layui-input"/>
+                            <form:input placeholder="请输入被告2" maxlength="64" path="defendantSecond" id="defendantSecond" htmlEscape="false" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm12 with-textarea">
@@ -492,7 +492,7 @@
                                                    class="op-btn op-btn-delete"><i class="fa fa-trash"></i>&nbsp;删除</a>
                                             </c:if>
                                             <c:if test="${workClientAttachment.collectFlag != 1}">
-                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn layui-btn-warm" >&nbsp;收藏</a>
                                             </c:if>
                                         </div>
                                     </td>
@@ -689,7 +689,7 @@
                                                        class="op-btn op-btn-delete"><i class="fa fa-trash"></i>&nbsp;删除</a>
                                                 </c:if>
                                                 <c:if test="${workClientAttachment.collectFlag != 1}">
-                                                    <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                                    <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn layui-btn-warm" >&nbsp;收藏</a>
                                                 </c:if>
                                             </div>
                                         </td>
@@ -885,7 +885,7 @@
                                                        class="op-btn op-btn-delete"><i class="fa fa-trash"></i>&nbsp;删除</a>
                                                 </c:if>
                                                 <c:if test="${workClientAttachment.collectFlag != 1}">
-                                                    <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                                    <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn layui-btn-warm" >&nbsp;收藏</a>
                                                 </c:if>
                                             </div>
                                         </td>