样式调整

src/main/resources/jeeplus.properties

@@ -7,10 +7,11 @@ jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
 db.name=ruihuaoa-activity-data
 #jdbc.url=jdbc:mysql://192.168.2.4:3306/simple_xg_total_process?useUnicode=true&characterEncoding=utf-8
-jdbc.url=jdbc:mysql://127.0.0.1:3306/new_ccpm_1?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://127.0.0.1:3306/yida_ccpm?useUnicode=true&characterEncoding=utf-8
+#jdbc.url=jdbc:mysql://127.0.0.1:3306/ydjh_ccpm?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
-jdbc.password=123456
-#jdbc.password=root
+jdbc.password=root
+#jdbc.password=Wlc07051032@
 
 #pool settings
 jdbc.pool.init=20
@@ -149,14 +150,14 @@ aliyunUrl=http://oss.gangwaninfo.com
 aliyunDownloadUrl=http://cdn.gangwaninfo.com
 oSSUrl=http://cdn.gangwaninfo.com/jeeplus-resource-data/static
 endpoint=http://oss-cn-hangzhou.aliyuncs.com
-accessKeyId=LTAI5tQDWoM9c1WyJNPs86rX
-accessKeySecret=84dDIx4edT1n78KUOqqSmDZ35pchJv
+accessKeyId=LTAI5tQF23GydACPYdy1P7qA
+accessKeySecret=d09HY5iZZ5zlqh3PDbaSOEWOUSg097
 #\u5F00\u53D1\u73AF\u5883
-bucketName=xgxm-test
+bucketName=ydjh-erp
 #\u751F\u4EA7\u73AF\u5883
 #bucketName=xg-ccpm
 #ǩ��bucketName
-qzBucketName=xg-qz
+qzBucketName=ydjh-erp
 avatarDir=app-img/avatar/
 notifyDir=app-img/notify/
 reportDir=app-img/report/

src/main/webapp/webpage/modules/sealApplyFor/sealApplyForForm2.jsp

@@ -61,7 +61,16 @@
                         return false;
                     }
                     var size2 = $("#sealMaterialInfoList tr").length;
-                    if(size2 < 1){
+                    var flag = 0;
+                    for (var i = 0; i < size2; i++) {
+                        var delFalg = $("#sealMaterialInfoList").find("tr").eq(i).find("input").eq(1).val();
+                        if(1 != delFalg){
+                            flag = 1
+                        }
+                    }
+                    console.log(121312)
+
+                    if(flag == 0){
                         parent.layer.msg("盖章文件至少存在一条!", {icon: 5});
                         return false;
                     }
@@ -79,21 +88,23 @@
                     // console.log('val2', val2)
                     var arr = [];
                     for (var j=0;j<size;j++){
-                        // var val = $("#sealMaterialInfoList").find("tr").eq(j).find("input").eq(3).val();
-                        var val = $("#sealMaterialInfoList").find("tr").eq(j).find("input").eq(6).val();
+                        var val = $("#workInvoiceProjectRelationList").find("tr").eq(j).find("input").eq(6).val();
                         arr.push(val);
                     }
                     console.log('arr', arr)
                     for (var i = 0; i < size2; i++) {
                         // var delFlag = $("#workInvoiceProjectRelationList").val()
                         // var val = $("#workInvoiceProjectRelationList").find("tr").eq(i).find("input").eq(6).val();
-                        var val = $("#workInvoiceProjectRelationList").find("tr").eq(i).find("input").eq(3).val();
-                        console.log('val', val)
-                        if (arr.includes(val)){
+                        var delFalg = $("#sealMaterialInfoList").find("tr").eq(j).find("input").eq(1).val();
+                        if(1 != delFalg){
+                            var val = $("#sealMaterialInfoList").find("tr").eq(i).find("input").eq(3).val();
+                            console.log('val', val)
+                            if (arr.includes(val)){
 
-                        }else {
-                            parent.layer.msg("盖章文件的报告号必须与项目信息的报告号相同!", {icon: 5});
-                            return false;
+                            }else {
+                                parent.layer.msg("盖章文件的报告号必须与所选项目信息的报告号相同!", {icon: 5});
+                                return false;
+                            }
                         }
                     }
 

src/main/webapp/webpage/modules/sealApplyFor/sealApplyForView.jsp

@@ -19,7 +19,7 @@
             background: red;
         }
         td input{
-            margin-left:-10px !important;
+            margin-left:0px !important;
             height: 42px !important;
         }
         .disables {
@@ -40,6 +40,10 @@
             font-size: 12px;
             padding-left: 10px;
         }
+        #workInvoiceProjectRelationList td{
+            padding-left: 0px;
+            padding-right: 0px;
+        }
     </style>
     <script type="text/javascript">
         var validateForm;
@@ -257,12 +261,11 @@
 							<input id="workInvoiceProjectRelationList{{idx}}_createById" name="workInvoiceProjectRelationList[{{idx}}].createById" type="hidden" value="{{row.createById}}"/>
 							<input id="workInvoiceProjectRelationList{{idx}}_projectMasterId" name="workInvoiceProjectRelationList[{{idx}}].projectMasterId" type="hidden" value="{{row.projectMasterId}}"/>
                         </td>
-                        <td>
-                        <sys:gridselectcallproject2 url="${ctx}/sealApplyFor/sealApplyFor/selectprojectOnList" id="workInvoiceProjectRelationList{{idx}}_projectId" name="workInvoiceProjectRelationList{{idx}}.projectId"  value="{{row.projectId}}"  title="选择所属项目" labelName="workInvoiceProjectRelationList[{{idx}}].projectName" cssStyle="background-color:#fff"
-                                                       labelValue="{{row.projectName}}" cssClass="form-control required layui-input"  fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName" ></sys:gridselectcallproject2>
+                        <td style="text-align:center;">
+                           <input id="workInvoiceProjectRelationList{{idx}}_projectName" name="workInvoiceProjectRelationList[{{idx}}].projectName" title="{{row.projectName}}" type="text" value="{{row.projectName}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td style="text-align:center;">
-							<input id="workInvoiceProjectRelationList{{idx}}_projectReportDataNumber" name="workInvoiceProjectRelationList[{{idx}}].projectReportDataNumber" title="报告号" type="text" value="{{row.reportDataNum}}" readonly="readonly"  class="form-control"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_projectReportDataNumber" name="workInvoiceProjectRelationList[{{idx}}].projectReportDataNumber" title="{{row.reportDataNum}}" type="text" value="{{row.reportDataNum}}" readonly="readonly"  class="form-control"/>
                         </td>
                         <td>
 							<input id="workInvoiceProjectRelationList{{idx}}_createByName" title="创建人" name="workInvoiceProjectRelationList[{{idx}}].createByName" type="text" value="{{row.createByName}}" readonly="readonly"  class="form-control"/>
@@ -331,7 +334,7 @@
                             <thead>
                             <tr>
                                 <th class="hide"></th>
-                                <th >报告号</th>
+                                <th width="250px">报告号</th>
                                 <th >盖章材料名称</th>
                                 <th >份数</th>
                                 <th >主要内容简述</th>