فهرست منبع

项目计划书页面时间控件属性添加

user5 5 سال پیش
والد
کامیت
dae5d9923d

+ 68 - 0
src/main/resources/mappings/modules/projectrecord/ProjectRecordsDao.xml

@@ -54,10 +54,13 @@
 			<include refid="projectRecordsColumns"/>
         ,su.name AS "createBy.name"
         ,o.top_company AS "office.name"
+        ,prd.name AS "reportData.name"
+        ,prd.id AS "reportData.id"
         FROM project_records a
         <include refid="projectRecordsJoins"/>
         LEFT JOIN sys_user su ON su.id = a.create_by
         LEFT JOIN sys_office o ON o.id = a.office_id
+        LEFT JOIN project_report_data prd ON prd.project_id = a.id
 		WHERE a.id = #{id}
 	</select>
 	
@@ -270,6 +273,71 @@
         </where>
     </select>
 
+
+
+    <select id="findProjectSpecialistAssessList" resultType="ProjectRecords" >
+        SELECT
+        <include refid="projectRecordsColumns"/>
+        ,
+        wci.name AS "workContractInfo.name",
+        wct.id AS "workContractInfo.client.id",
+        wct.name AS "workContractInfo.client.name",
+        o.top_company AS "office.name"
+        FROM project_records a
+        <include refid="projectRecordsJoins"/>
+
+        <if test="leaderNameStr !=null and leaderNameStr !=''">
+            LEFT JOIN work_project_user w on a.id = w.project_id
+            LEFT JOIN sys_user su on w.user_id = su.id
+        </if>
+        LEFT JOIN work_project_user w1 on a.id = w1.project_id
+        LEFT JOIN work_contract_info wci on a.contract_id = wci.id
+        LEFT JOIN work_client_info wct on wci.client_id = wct.id
+        LEFT JOIN sys_office o ON o.id = a.office_id
+        left join project_report_data prd on prd.project_id = a.id
+        <where>
+            a.status = 5 and prd.status = 5 and a.id not in (
+            select psa.project_id from project_specialist_assess psa where psa.del_flag = 0
+            )
+        </where>
+        GROUP BY a.id
+        <choose>
+            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
+                ORDER BY ${page.orderBy}
+            </when>
+            <otherwise>
+                ORDER BY a.update_date DESC
+            </otherwise>
+        </choose>
+    </select>
+
+
+
+
+    <select id="queryCountProjectSpecialistAssess" resultType="int" >
+        SELECT count(DISTINCT pr.id)
+        FROM project_records pr
+        left join project_report_data prd on prd.project_id = pr.id
+        <where>
+            pr.status = 5 and prd.status = 5 and pr.id not in (
+              select psa.project_id from project_specialist_assess psa where psa.del_flag = 0
+            )
+        </where>
+    </select>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 	<select id="findListByStatus" resultType="ProjectRecords" >
 		SELECT
 		<include refid="projectRecordsColumns"/>

+ 41 - 4
src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -4,9 +4,11 @@
 <head>
     <title>项目管理</title>
     <meta name="decorator" content="default"/>
+    <script src="${ctxp}/static/layui/layui.js"></script>
     <script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
     <script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
+    <link rel='layuicss' type="text/css" href="${ctxp}/static/layui/css/layui.css"/>
     <style>
         #projectDesc-error{
             left:0;
@@ -357,6 +359,41 @@
             // var idx1 = $("#workClientLinkmanList tr").length;
             bornTemplete(list, idx, tpl, row, idx);
         }
+        function addPlanRow(list, idx, tpl, row){
+            // var idx1 = $("#workClientLinkmanList tr").length;
+            bornTempletePlan(list, idx, tpl, row, idx);
+        }
+
+        function bornTempletePlan(list, idx, tpl, row, idx1){
+            $(list).append(Mustache.render(tpl, {
+                idx: idx, delBtn: true, row: row,
+                order:idx1 + 1
+            }));
+            $(list+idx).find("select").each(function(){
+                $(this).val($(this).attr("data-value"));
+            });
+            $(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
+                var ss = $(this).attr("data-value").split(',');
+                for (var i=0; i<ss.length; i++){
+                    if($(this).val() == ss[i]){
+                        $(this).attr("checked","checked");
+                    }
+                }
+            });
+
+            laydate.render({
+                elem : (list+idx+"_beginDate"),
+                event: 'focus',
+                type : 'date',
+                trigger: 'click'
+            });
+            laydate.render({
+                elem : (list+idx+"_endDate"),
+                event: 'focus',
+                type : 'date',
+                trigger: 'click'
+            });
+        }
 
         function bornTemplete(list, idx, tpl, row, idx1){
             $(list).append(Mustache.render(tpl, {
@@ -765,7 +802,7 @@
                     <div class="layui-input-block">
                         <div class="layui-item nav-btns" style="padding-left:0px;">
                             <a class="nav-btn nav-btn-add"
-                               onclick="addRow('#projectPlanList', workClientBankRowIdx, workClientBankTpl);workClientBankRowIdx = workClientBankRowIdx + 1;"
+                               onclick="addPlanRow('#projectPlanList', workClientBankRowIdx, workClientBankTpl);workClientBankRowIdx = workClientBankRowIdx + 1;"
                                title="新增"><i class="fa fa-plus"></i> 新增</a>
                         </div>
                         <table id="bankinfo" class="table table-bordered table-condensed can-edit">
@@ -788,10 +825,10 @@
                                     <input id="projectPlanList{{idx}}_delFlag" name="projectPlanList[{{idx}}].delFlag" type="hidden" value="0"/>
                                 </td>
                                 <td>
-                                    <input id="projectPlanList{{idx}}_beginDate" name="projectPlanList[{{idx}}].beginDate" type="text" value="{{row.beginDate}}"  class="form-control required"/>
+                                    <input lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_beginDate" name="projectPlanList[{{idx}}].beginDate" type="text" value="{{row.beginDate}}"  class="form-control required datetime"/>
                                 </td>
                                 <td>
-                                    <input id="projectPlanList{{idx}}_endDate" name="projectPlanList[{{idx}}].endDate" type="text" value="{{row.endDate}}"  class="form-control required"/>
+                                    <input lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_endDate" name="projectPlanList[{{idx}}].endDate" type="text" value="{{row.endDate}}"  class="form-control required datetime"/>
                                 </td>
                                 <td>
                                     <input id="projectPlanList{{idx}}_remarks" name="projectPlanList[{{idx}}].remarks" type="text" value="{{row.remarks}}"    class="form-control required"/>
@@ -1069,7 +1106,7 @@
         var data = ${fns:toJson(projectRecords.projectPlanList)};
         if (null!=data){
             for (var i = 0; i < data.length; i++) {
-                addRow('#projectPlanList', workClientBankRowIdx, workClientBankTpl, data[i]);
+                addPlanRow('#projectPlanList', workClientBankRowIdx, workClientBankTpl, data[i]);
                 workClientBankRowIdx = workClientBankRowIdx + 1;
             }
         }