任务书等增加限制条件

src/main/resources/templates/payapply/list.html

@@ -125,9 +125,9 @@
              <!--   <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="delete">
                     <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>删除
                 </button>-->
-                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="tjApprove">
+<!--                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="tjApprove">
                     <i class="layui-icon layui-icon-ok" style="font-size: 10px;"></i>提交审批
-                </button>
+                </button>-->
                 <button class="layui-btn layui-btn-sm data-add-btn" lay-event="tjrevokeApprove">
                     <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>撤销审批
                 </button>
@@ -573,6 +573,9 @@
                 Message.warning("请选择一条记录进行撤销！", 1500);
             } else if (data[0].spzt == "审批结束") {
                 Message.warning("该付款申请已审批结束！", 1500);
+            }else if (data[0].spzt == "科技项目管理专责2审批" || data[0].spzt == '科技部部门主任审批'){
+                layer.msg('当前项目已审批，不允许撤回！',{icon:2});
+                return;
             }
            // else if (data[0].cjr != userId) {
                 //Message.error("您不是该付款申请的创建人！", 1500);}

src/main/resources/templates/prjfeescheme/update.html

@@ -347,7 +347,73 @@
         });
         //双击（承担单位）
         table.on('rowDouble(currentTableFilter)', function (obj) {
-            var data = obj.data;
+
+            var companys = table.cache["currentTableId"];
+            if (companys.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 {
+                cdCompany = {
+                    "xh": data[0].xh,
+                    "dw": data[0].dw,
+                    "dwmc": data[0].dwmc,
+                    "skje": data[0].skje,
+                    "bz": data[0].bz
+                };
+
+                var index = layer.open({
+                    title: '编辑承担单位',
+                    type: 2,
+                    // maxmin: true,
+                    shade: 0.2,
+                    area: [layerwidth + 'px', layerheight + 'px'],
+                    content: AjaxUtil.ctx + 'prjUndertakecompany/forUpdate',
+                    end: function (index) {
+                        if (updateflag == 1) {
+                            updateflag = 0;
+                            var oldData = table.cache["currentTableId"];
+
+                            var currCompany = {
+                                "xh": cdCompany.xh,
+                                "dw": cdCompany.dw,
+                                "dwmc": cdCompany.dwmc,
+                                "skje": cdCompany.skje,
+                                "bz": cdCompany.bz
+                            };
+
+                            for (var i = 0; i < oldData.length; i++) {
+                                var item = oldData[i];
+                                if (item.LAY_CHECKED) {//条件：选中
+                                    oldData.splice(i, 1);//移除后后造成数组下标索引发生变化，所以下面需要i--
+                                    break;
+                                }
+                            }
+                            //刷新表格
+                            var currData = oldData;
+                            currData.push(currCompany);
+                            table.reload('currentTableId', {
+                                data: currData
+                            });
+
+                            //出资金额
+                            var czje = 0;
+                            for (let item of currData) {
+                                czje += parseFloat(item.skje);
+                            }
+                            $("#czje").val(czje);
+                        }
+                    }
+                });
+            }
+
+
+/*            var data = obj.data;
             cdCompany = {
                 "xh": data.xh,
                 "dw": data.dw,
@@ -366,7 +432,7 @@
                 end: function () {
                     layer.close(index);
                 }
-            });
+            });*/
         });
 
         // 监听确认按钮

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

@@ -971,35 +971,86 @@
         });
         //双击（主要完成人）
         table.on('rowDouble(currentTableFilter1)', function (obj) {
-            var data = obj.data;
-            prjMember = {
-                "ry": data.ry,
-                "ryxm": data.ryxm,
-                "dw": data.dw,
-                "dwmc": data.dwmc,
-                "dwlx": data.dwlx,
-                "dwlxmc": data.dwlxmc,
-                "zc": data.zc,
-                "zcmc": data.zcmc,
-                "xl": data.xl,
-                "xlmc": data.xlmc,
-                "xmjs": data.xmjs,
-                "xmjsmc": data.xmjsmc,
-                "bxmfg": data.bxmfg,
-                "sxbh": data.sxbh,
-                "trgzzys": data.trgzzys
-            };
-            layer.open({
-                title: '浏览项目人员',
-                type: 2,
-                maxmin: true,
-                shade: 0.2,
-                area: ['820px', layerheight + 'px'],
-                content: AjaxUtil.ctx + 'prjMember/forView',
-                end: function (index) {
-                    layer.close(index);
-                }
-            });
+            var members = table.cache["currentTableId1"];
+            if (members.length == 0)
+                return;
+
+            var checkStatus = table.checkStatus('currentTableId1')
+                , data = checkStatus.data;
+            if (data == null || data.length === 0) {
+                Message.warning("请选择要编辑的项目人员！", 1500);
+            } else if (data.length > 1) {
+                Message.warning("请选择一条记录进行编辑操作！", 1500);
+            } else {
+                prjMember = {
+                    "ry": data[0].ry,
+                    "ryxm": data[0].ryxm,
+                    "dw": data[0].dw,
+                    "dwmc": data[0].dwmc,
+                    "dwlx": data[0].dwlx,
+                    "dwlxmc": data[0].dwlxmc,
+                    "zc": data[0].zc,
+                    "zcmc": data[0].zcmc,
+                    "xl": data[0].xl,
+                    "xlmc": data[0].xlmc,
+                    "xmjs": data[0].xmjs,
+                    "xmjsmc": data[0].xmjsmc,
+                    "bxmfg": data[0].bxmfg,
+                    "sxbh": data[0].sxbh,
+                    "trgzzys": data[0].trgzzys
+                };
+
+
+                layer.open({
+                    title: '编辑项目人员',
+                    type: 2,
+                    maxmin: true,
+                    shade: 0.2,
+                    area: ['820px', layerheight + 'px'],
+                    content: AjaxUtil.ctx + 'prjMember/forUpdate',
+                    end: function (index) {
+                        if (updateflag == 1) {
+                            updateflag = 0;
+
+                            var currMember = {
+                                "ry": prjMember.ry,
+                                "ryxm": prjMember.ryxm,
+                                "dw": prjMember.dw,
+                                "dwmc": prjMember.dwmc,
+                                "dwlx": prjMember.dwlx,
+                                "dwlxmc": prjMember.dwlxmc,
+                                "zc": prjMember.zc,
+                                "zcmc": prjMember.zcmc,
+                                "xl": prjMember.xl,
+                                "xlmc": prjMember.xlmc,
+                                "xmjs": prjMember.xmjs,
+                                "xmjsmc": prjMember.xmjsmc,
+                                "bxmfg": prjMember.bxmfg,
+                                "sxbh": prjMember.sxbh,
+                                "trgzzys": prjMember.trgzzys
+                            };
+
+                            var oldData = table.cache["currentTableId1"];
+                            for (var i = 0; i < oldData.length; i++) {
+                                var item = oldData[i];
+                                if (item.LAY_CHECKED) {//条件：选中
+                                    // oldData.splice(i, 1);//移除后后造成数组下标索引发生变化，所以下面需要i--
+                                    oldData[i] = currMember;
+                                    break;
+                                }
+                            }
+                            setTimeout(function () {
+                                var currData = oldData;
+                                // currData.push(currMember);
+                                table.reload('currentTableId1', {
+                                    data: currData
+                                });
+                            }, 500);
+
+                        }
+                    }
+                });
+            }
         });
 
         var dataCompany = new Array();
@@ -1217,7 +1268,80 @@
         });
         //双击（主要完成单位）
         table.on('rowDouble(currentTableFilter2)', function (obj) {
-            var data = obj.data;
+
+            var companys = table.cache["currentTableId2"];
+            if (companys.length == 0)
+                return;
+
+            var checkStatus = table.checkStatus('currentTableId2')
+                , data = checkStatus.data;
+            if (data == null || data.length === 0) {
+                Message.warning("请选择要编辑的单位！", 1500);
+            } else if (data.length > 1) {
+                Message.warning("请选择一条记录进行编辑操作！", 1500);
+            } else {
+                prjCompany = {
+                    "dw": data[0].dw,
+                    "dwmc": data[0].dwmc,
+                    "dwqc": data[0].dwqc,
+                    "sxbh": data[0].sxbh,
+                    "lxr": data[0].lxr,
+                    "lxrxm": data[0].lxrxm,
+                    "sfzyzf": data[0].sfzyzf
+                };
+
+                layer.open({
+                    title: '编辑项目单位',
+                    type: 2,
+                    maxmin: true,
+                    shade: 0.2,
+                    area: ['820px', layerheight + 'px'],
+                    content: AjaxUtil.ctx + 'prjCompletecompany/forUpdate',
+                    end: function (index) {
+                        if (updateflag == 1) {
+                            updateflag = 0;
+                            if (prjCompany.sfzyzf == undefined)
+                                prjCompany.sfzyzf = 0;
+                            else
+                                prjCompany.sfzyzf = 1;
+
+                            var sfzyzfmc = "否";
+                            if (prjCompany.sfzyzf == 1)
+                                sfzyzfmc = "是";
+
+                            var currCompany = {
+                                "dw": prjCompany.dw,
+                                "dwmc": prjCompany.dwmc,
+                                "dwqc": prjCompany.dwqc,
+                                "sxbh": prjCompany.sxbh,
+                                "lxr": prjCompany.lxr,
+                                "lxrxm": prjCompany.lxrxm,
+                                "sfzyzf": prjCompany.sfzyzf,
+                                "sfzyzfmc": sfzyzfmc
+                            };
+
+                            var oldData = table.cache["currentTableId2"];
+                            for (var i = 0; i < oldData.length; i++) {
+                                var item = oldData[i];
+                                if (item.LAY_CHECKED) {//条件：选中
+                                    // oldData.splice(i, 1);//移除后后造成数组下标索引发生变化，所以下面需要i--
+                                    oldData[i] = currCompany;
+                                    break;
+                                }
+                            }
+
+                            //刷新表格
+                            var currData = oldData;
+                            // currData.push(currCompany);
+                            table.reload('currentTableId2', {
+                                data: currData
+                            });
+                        }
+                    }
+                });
+            }
+
+/*            var data = obj.data;
             prjCompany = {
                 "dw": data.dw,
                 "dwmc": data.dwmc,
@@ -1237,7 +1361,7 @@
                 end: function () {
                     layer.close(index);
                 }
-            });
+            });*/
         });
 
         // //所属部门
@@ -1637,7 +1761,34 @@
         });
         //双击（子课题）
         table.on('rowDouble(currentTableFilter3)', function (obj) {
-            var data = obj.data;
+            var subTopics = table.cache["currentTableId3"];
+            if (subTopics.length == 0)
+                return;
+
+            var checkStatus = table.checkStatus('currentTableId3')
+                , data = checkStatus.data;
+            if (data == null || data.length === 0) {
+                Message.warning("请选择要编辑的子课题！", 1500);
+            } else if (data.length > 1) {
+                Message.warning("请选择一条记录进行编辑！", 1500);
+            } else {
+                layer.open({
+                    title: '编辑子课题',
+                    type: 2,
+                    maxmin: true,
+                    shade: 0.2,
+                    area: ['1030px', layerheight + 'px'],
+                    content: AjaxUtil.ctx + 'prjSubtopic/forUpdate/' + data[0].id,
+                    end: function (index) {
+                        // 重载表格
+                        if (updateflag == 1)
+                            currTable3.reload();
+                        updateflag = 0;
+                        layer.close(index);
+                    }
+                });
+            }
+/*            var data = obj.data;
             layer.open({
                 title: '浏览子课题',
                 type: 2,
@@ -1648,7 +1799,7 @@
                 end: function () {
                     layer.close(index);
                 }
-            });
+            });*/
         });
 
         // 监听确认按钮（内容）
@@ -2239,7 +2390,35 @@
         });
         //双击（出资方案）
         table.on('rowDouble(currentTableFilter6)', function (obj) {
-            var data = obj.data;
+
+            var czfas = table.cache["currentTableId6"];
+            if (czfas.length == 0)
+                return;
+
+            var checkStatus = table.checkStatus('currentTableId6')
+                , data = checkStatus.data;
+            if (data == null || data.length === 0) {
+                Message.warning("请选择要编辑的出资方案！", 1500);
+            } else if (data.length > 1) {
+                Message.warning("请选择一条记录进行编辑！", 1500);
+            } else {
+                layer.open({
+                    title: '编辑出资方案',
+                    type: 2,
+                    maxmin: true,
+                    shade: 0.2,
+                    area: ['1010px', layerheight + 'px'],
+                    content: AjaxUtil.ctx + 'prjFeescheme/forUpdate/' + data[0].id + '?qs=' + $("#qs").val() + '&wc=' + $("#wc").val() + '&ysjecz=' + $("#rwsys").val(),
+                    end: function (index) {
+                        // 重载表格
+                        if (updateflag == 1)
+                            currTable6.reload();
+                        updateflag = 0;
+                        layer.close(index);
+                    }
+                });
+            }
+            /*    var data = obj.data;
             layer.open({
                 title: '浏览出资方案',
                 type: 2,
@@ -2247,7 +2426,7 @@
                 shade: 0.2,
                 area: ['1010px', layerheight + 'px'],
                 content: AjaxUtil.ctx + 'prjFeescheme/forView/' + data.id,
-            });
+            });*/
         });
 
         // 监听确认按钮（说明）

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

@@ -103,14 +103,14 @@
                             <label class="layui-form-label required" style="width: 15%;margin-left: -70px">起止时间</label>
                             <div class="layui-input-inline" style="width:20%">
                                 <input type="text" name="qssj" id="qssj" placeholder="开始日期" lay-verify="required"
-                                       lay-reqtext="开始日期不能为空" autocomplete="off" class="layui-input">
+                                       lay-reqtext="开始日期不能为空" autocomplete="off" class="layui-input" disabled>
                                 <tip>日期格式：yyyy-MM-dd</tip>
 
                             </div>
                             <div class="layui-form-mid">-</div>
                             <div class="layui-input-inline" style="width: 20%">
                                 <input type="text" name="jssj" id="jssj" placeholder="结束日期" lay-verify="required"
-                                       lay-reqtext="结束日期不能为空" autocomplete="off" class="layui-input">
+                                       lay-reqtext="结束日期不能为空" autocomplete="off" class="layui-input" disabled>
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">

src/main/resources/templates/prjsubtopic/update.html

@@ -540,7 +540,75 @@
         });
         //双击(单位分工)
         table.on('rowDouble(currentTableFilter1)', function (obj) {
-            var data = obj.data;
+            var companys = table.cache["currentTableId1"];
+            if (companys.length == 0)
+                return;
+
+            var checkStatus = table.checkStatus('currentTableId1')
+                , data = checkStatus.data;
+            if (data == null || data.length === 0) {
+                Message.warning("请选择要编辑的单位！", 1500);
+            } else if (data.length > 1) {
+                Message.warning("请选择一条记录进行编辑操作！", 1500);
+            } else {
+                fgCompany = {
+                    "xh": data[0].xh,
+                    "zkt": data[0].zkt,
+                    "dw": data[0].dw,
+                    "dwmc": data[0].dwmc,
+                    "dwqc": data[0].dwqc,
+                    "zyyjnr": data[0].zyyjnr,
+                    "jf": data[0].jf
+                };
+
+                layer.open({
+                    title: '编辑分工单位',
+                    type: 2,
+                    // maxmin: true,
+                    shade: 0.2,
+                    area: [layerwidth + 'px', layerheight + 'px'],
+                    content: AjaxUtil.ctx + 'prjDivisioncompany/forUpdate',
+                    end: function (index) {
+
+                        if (updateflag == 1) {
+                            updateflag = 0;
+                            var oldData = table.cache["currentTableId1"];
+
+                            var currCompany = {
+                                "xh": fgCompany.xh,
+                                "dw": fgCompany.dw,
+                                "dwmc": fgCompany.dwmc,
+                                "dwqc": fgCompany.dwqc,
+                                "zyyjnr": fgCompany.zyyjnr,
+                                "jf": fgCompany.jf
+                            };
+
+                            for (var i = 0; i < oldData.length; i++) {
+                                var item = oldData[i];
+                                if (item.LAY_CHECKED) {//条件：选中
+                                    // oldData.splice(i, 1);//移除后后造成数组下标索引发生变化，所以下面需要i--
+                                    oldData[i] = currCompany;
+                                    break;
+                                }
+                            }
+                            //刷新表格
+                            var currData = oldData;
+                            // currData.push(currCompany);
+                            table.reload('currentTableId1', {
+                                data: currData
+                            });
+
+                            //经费计算
+                            var jf = 0;
+                            for (let item of currData) {
+                                jf += parseFloat(item.jf);
+                            }
+                            $("#jf").val(jf);
+                        }
+                    }
+                });
+            }
+            /*            var data = obj.data;
             fgCompany = {
                 "xh": data.xh,
                 "dwmc": data.dwmc,
@@ -559,7 +627,7 @@
                 end: function (index) {
                     layer.close(index);
                 }
-            });
+            });*/
         });
         //存储表格内容
         var dateTable = new Array();

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

@@ -32,21 +32,21 @@
             <label class="layui-form-label required" style="width: 15%">单位</label>
             <div class="layui-input-inline" style="width: 70%">
                 <input type="hidden" id="dw" name="dw" class="layui-input">
-                <input type="text" id="dwmc" name="dwmc" lay-verify="required" lay-reqtext="单位不能为空" class="layui-input"
+                <input type="text" id="dwmc" name="dwmc" lay-verify="required" lay-reqtext="单位不能为空" class="layui-input" placeholder="请选择单位..."
                        readonly>
             </div>
         </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label required" style="width: 15%">收款金额(万)</label>
             <div class="layui-input-inline" style="width: 70%">
-                <input type="number" id="skje" name="skje" lay-verify="required" lay-reqtext="收款金额不能为空"
+                <input type="number" id="skje" name="skje" lay-verify="required" lay-reqtext="收款金额不能为空" placeholder="请输入收款金额..."
                        autocomplete="off" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label" style="width: 15%">备注</label>
             <div class="layui-input-inline" style="width: 70%">
-                <textarea id="bz" name="bz" class="layui-textarea" autocomplete="off" style="height: 180px"></textarea>
+                <textarea id="bz" name="bz" class="layui-textarea" autocomplete="off" style="height: 180px" placeholder="请录入详细备注信息..."></textarea>
             </div>
         </div>
 
@@ -101,6 +101,11 @@
         //监听提交
         form.on('submit(saveBtn)', function (data) {
             var skje = parseFloat(document.getElementById("skje").value);
+            if (skje <= 0){
+                layer.msg('收款金额必须大于零！',{icon:2});
+                $('#skje').val('');
+                return  false;
+            }
             if (parseInt($("#ysjecz").val()) - parseInt(skje) < 0) {
                 Message.error("不能超出预算金额！", 1500);
                 return false;

src/main/resources/templates/prjundertakecompany/update.html

@@ -73,13 +73,17 @@
 
         //监听提交
         form.on('submit(saveBtn)', function (data) {
+            var skje = parseFloat(document.getElementById("skje").value);
+            if (skje <= 0){
+                layer.msg('收款金额必须大于零！',{icon:2});
+                $('#skje').val('');
+                return  false;
+            }
             parent.setCdCompany(data.field);
             parent.setUpdateFlag();
             parent.layer.close(parent.layer.getFrameIndex(window.name));// 关闭子窗口
-
             return false;
         });
-
         // 监听取消按钮
         $("button[lay-filter='cancleBtn']").click(function () {
             var iframeIndex = parent.layer.getFrameIndex(window.name);

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

@@ -44,7 +44,7 @@
                                    lay-reqtext="年度预算不能为空">
                             <input type="hidden" id="xmmc" name="xmmc" class="layui-input">
                             <select name="Annualbudget" id="Annualbudget" lay-filter="Annualbudget" >
-                                <option value="">[无]</option>
+                                <option value="">[请先选择项目]</option>
                                 <option value="-1">[浏览]</option>
                             </select>
                         </div>
@@ -74,7 +74,7 @@
                         <div class="layui-input-inline" style="width: 300px">
                             <input type="hidden" id="fjmc" name="fjmc" class="layui-input">
                             <input type="hidden" id="fylb" name="fylb" class="layui-input">
-                            <input type="text" id="fylbmc" name="fylbmc" lay-verify="required"
+                            <input type="text" id="fylbmc" name="fylbmc" lay-verify="required" placeholder="请选择费用类别..."
                                        lay-reqtext="费用类别不能为空" class="layui-input" readonly>
                         </div>
                     </div>
@@ -110,7 +110,7 @@
                             <label class="layui-form-label required"
                                    style="width: 80px; margin-left: -5px">申请金额(元)</label>
                         <div class="layui-input-inline" style="width: 300px">
-                            <input type="number" id="sqje" name="sqje" class="layui-input" lay-verify="required"
+                            <input type="number" id="sqje" name="sqje" class="layui-input" lay-verify="required" placeholder="请输入申请金额..."
                                        lay-reqtext="申请金额不能为空" autocomplete="off">
                         </div>
                     </div>