审批修改

src/main/java/com/liang/controller/PrjApproverecordController.java

@@ -786,13 +786,13 @@ public class PrjApproverecordController extends BaseController {
 
             if (approverecord.getSpcz().equals("返回修改")) {
             record1.setSffh(true);//是否返回
-            record1.setYj(approverecord.getYj());
+            record1.setYj(approverecord.getYj2());
         } else {
             record1.setSffh(false);//是否返回
             if (!approverecord.getSpcz().equals("提交审批"))
                 record1.setYj(approverecord.getYj());
             //是否需要上级审核
-            if (approverecord.getZt().equals(PostInfoEnum.KJXMGLZZ.postName() + "审批")) {
+            if (approverecord.getZt().equals(PostInfoEnum.KYJHZZ.postName() + "审批")) {
                 record1.setSfsjsh(false);
             } else {
                 record1.setSfsjsh(true);
@@ -815,14 +815,13 @@ public class PrjApproverecordController extends BaseController {
                 record2.setZt("未提交(返回)");
                 record2.setShr(approverecord.getTjr());//审核人
             } else {
-                record2.setZt(PostInfoEnum.KJXMGLZZ.postName() + "审批");
+                record2.setZt(PostInfoEnum.KYJHZZ.postName() + "审批");
                 record2.setShr(approverecord.getSjshr());//审核人
                 record2.setShgw(approverecord.getSjshgw());//审核岗位
             }
             record2.setWc(false);
             recordList.add(record2);
         }
-
         int num = prjApproverecordService.insertApprove(recordList);
         if (num > 0) {
             return BaseResult.success("保存成功!");

src/main/resources/templates/prjproject/add.html

@@ -447,7 +447,7 @@
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 10%">有关问题说明</label>
                             <div class="layui-input-inline" style="width: 70%">
-                                <textarea id="ygwtsm" name="ygwtsm" class="layui-textarea"
+                                <textarea id="ygwtsm" name="ygwtsm" class="layui-textarea" placeholder="请填入说明..."
                                           style="width: 100%;height: 510px"></textarea>
                             </div>
                         </div>

src/main/resources/templates/prjproject/back_approve.html

@@ -44,20 +44,8 @@
                 </select>
             </div>
         </div>
-        <!--     <div class="layui-form-item layui-inline" style="width: 100%">-->
-        <!--        <label class="layui-form-label" style="width: 95px">返回意见</label>-->
-        <!--         <div class="layui-input-inline" style="width: 840px">-->
-        <!--            <textarea id="yj" name="yj"  class="layui-textarea" style="width: 840px;height: 100px" th:text="${approveInfo.yj}"></textarea>-->
-        <!--        </div>-->
-        <!--     </div>-->
-        <!--     <div class="layui-form-item layui-inline" style="width: 100%">-->
-        <!--         <label class="layui-form-label" style="width: 95px">选择常用语</label>-->
-        <!--        <div class="layui-input-inline" style="width: 750px">-->
-        <!--           <input type="text" id="cyy" name="cyy" class="layui-input" readonly>-->
-        <!--        </div>-->
-        <!--       <button type="button" class="layui-btn" lay-filter="cyySaveBtn" style="width: 80px">常用语</button>-->
-    </div>
-    -->
+
+
     <div class="layui-form-item layui-inline" style="width: 100%">
         <label class="layui-form-label" style="width: 95px">提交人</label>
         <div class="layui-input-inline" style="width: 370px">
@@ -146,10 +134,10 @@
                     url: AjaxUtil.ctx + 'sysUserPost/postUserlist/' + postId,
                     cols: [
                         [
-                            {type: "radio", fixed: 'left'},
-                            {type: 'numbers', align: 'center'},
+                            {type: "radio", fixed: 'left',title: '😊'},
+                            {type: 'numbers', align: 'center',title: '序号'},
                             {field: 'name', width: '40%', title: '姓名', align: 'left'},
-                            {field: 'account', title: '账号', align: 'left'}
+                            {field: 'account',width:'40%', title: '账号', align: 'left'}
                         ]
                     ]
                 },
@@ -250,7 +238,7 @@
                             "id": xmApproval.xmid,
                             // "spzt": '科研计划专责审批'
                             // "spzt": '部门主任审批'
-                            "spzt": '科研计划专责审批审批'
+                            "spzt": '科研计划专责审批'
                         }
 
                         layer.load(0, {shade: 0.1});

src/main/resources/templates/prjproject/finish_approve.html

@@ -278,7 +278,6 @@
                         var spcz = $("#spcz").val();
                         if (spcz === '返回修改')
                             project.spzt = '未提交(返回)';
-
                         layer.load(0, {shade: 0.1});
                         AjaxUtil.post({
                             url: AjaxUtil.ctx + "prjProject/updateSpzt",
@@ -286,7 +285,6 @@
                             data: JSON.stringify(project),
                             success: function (res) {
                                 parent.setUpdateFlag();
-
                                 var iframeIndex = parent.layer.getFrameIndex(window.name);
                                 parent.layer.close(iframeIndex);
                             },

src/main/resources/templates/prjproject/list_myproject.html

@@ -357,6 +357,7 @@
                     });
                 });
             } else if (obj.event === 'exportExcel') {
+
                 var projects = table.cache["currentTableId"];
                 if (projects.length == 0)
                     return;
@@ -366,6 +367,7 @@
                 a.click();
                 a.parentNode.removeChild(a);
             } else if (obj.event === 'tjApprove') {
+
                 var projects = table.cache["currentTableId"];
                 if (projects.length == 0)
                     return;
@@ -380,6 +382,8 @@
                     Message.warning("该任务书已审批结束！", 1500);
                 } else if (data[0].spzt != null && data[0].spzt.indexOf("未提交") < 0) {
                     Message.warning("该任务书正在审批中……", 1500);
+                } else if (data[0].cjr != userId) {
+                    Message.error("您不是该任务书的创建人！", 1500);
                 } else {
                     xmApproval = {
                         "xmid": data[0].id,
@@ -411,6 +415,54 @@
                         }
                     });
                 }
+
+                /*
+
+                var projects = table.cache["currentTableId"];
+                if (projects.length == 0)
+                    return;
+
+                var checkStatus = table.checkStatus('currentTableId')
+                    , data = checkStatus.data;
+                if (data == null || data.length === 0) {
+                    Message.warning("请选择要提交审批的任务书！", 1500);
+                } else if (data.length > 1) {
+                    Message.warning("请选择一条记录进行提交！", 1500);
+                } else if (data[0].spzt == "审批结束") {
+                    Message.warning("该任务书已审批结束！", 1500);
+                } else if (data[0].spzt != null && data[0].spzt.indexOf("未提交") < 0) {
+                    Message.warning("该任务书正在审批中……", 1500);
+                } else {
+                    xmApproval = {
+                        "xmid": data[0].id,
+                        "xm": data[0].zwmc,
+                        "zt": data[0].spzt
+                    };
+                    if (data[0].spzt == null) {
+                        xmApproval.zt = "未提交";
+                        data[0].spzt = "未提交";
+                    }
+
+                    var content = AjaxUtil.ctx + 'prjProject/forApproveAdd';
+                    if (data[0].spzt != "未提交")
+                        // content = AjaxUtil.ctx + 'prjProject/forApproveUpdate/' + data[0].id + '?spzt=' + data[0].spzt;
+                        content = AjaxUtil.ctx + 'prjProject/forApproveUpdate/' + data[0].id + '/' + data[0].ysje + '?spzt=' + data[0].spzt;
+
+                    layer.open({
+                        title: '提交审批',
+                        type: 2,
+                        shade: 0.3,
+                        maxmin: true,
+                        shadeClose: true,
+                        area: ['1025px', layerheight + 'px'],
+                        content: content,
+                        end: function (index) {
+                            if (updateflag == 1)
+                                currTable.reload();
+                            updateflag = 0;
+                        }
+                    });
+                }*/
             } else if (obj.event === 'spOption') {
                 var projects = table.cache["currentTableId"];
                 if (projects.length == 0)