Merge branch 'master' into dev

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

@@ -237,7 +237,7 @@
             xmmc = xmmc.replace(/[\/\\]/g, '_');
             if (data.value == "-1") {
                 parent.layer.open({
-                    title: '浏览任务书',
+                    title: '浏览合同',
                     type: 2,
                     shade: 0.3,
                     maxmin: true,

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

@@ -95,6 +95,79 @@
         var dwId = prjCompany.dw;
         if (dwId != undefined && dwId != null && dwId != "")
             getLxr();
+        //单位
+        tableSelect.render({
+            elem: '#dwmc',
+            checkedKey: 'id',
+            searchKey: 'mc',
+            searchPlaceholder: '搜索单位',
+            table: {
+                url: AjaxUtil.ctx + 'baseCompany/dwlist',
+                cols: [
+                    [
+                        {type: 'radio',title: '😊'},
+                        {type: 'numbers', align: 'center',title: '序号'},
+                        {field: 'mc', width: '40%', title: '单位'},
+                        {field: 'dwqc', title: '单位全称',width: '40%'}
+                    ]
+                ]
+            },
+            done: function (elem, data) {
+                var NEWJSON = [];
+                var NEWJSON1 = [];
+                var NEWJSON2 = [];
+                var NEWJSON3 = [];
+                var NEWJSON4 = [];
+                layui.each(data.data, function (index, item) {
+                    NEWJSON.push(item.mc);
+                    NEWJSON1.push(item.id);
+                    NEWJSON2.push(item.dwqc);
+                    NEWJSON3.push(item.lxr);
+                    NEWJSON4.push(item.lxrxm);
+                })
+                elem.val(NEWJSON.join(","));
+                $("#dw").val(NEWJSON1.join(","));
+                $("#dwqc").val(NEWJSON2.join(","));
+                $("#lxr").val(NEWJSON3.join(","));
+                $("#lxrxm").val(NEWJSON4.join(","));
+
+                var dwId = $("#dw").val();
+                //联系人
+                if (dwId != undefined && dwId != null && dwId != "") {
+                    tableSelect.render({
+                        elem: '#lxrxm',
+                        checkedKey: 'id',
+                        searchKey: 'xm',
+                        searchPlaceholder: '搜索姓名',
+                        table: {
+                            url: AjaxUtil.ctx + 'basePerson/dwrylist/' + dwId,
+                            cols: [
+                                [
+                                    {type: "radio", fixed: 'left',title: '😊'},
+                                    {type: 'numbers', align: 'center',title: '序号'},
+                                    {field: 'xm', width: '20%', title: '姓名', align: 'left'},
+                                    {field: 'dwmc', width: '60%', title: '公司/单位', align: 'left'}
+                                ]
+                            ],
+                            done: function (res, curr, count) {
+
+                            },
+                            page: true
+                        },
+                        done: function (elem, data) {
+                            var NEWJSON = [];
+                            var NEWJSON1 = [];
+                            layui.each(data.data, function (index, item) {
+                                NEWJSON.push(item.xm);
+                                NEWJSON1.push(item.id);
+                            })
+                            elem.val(NEWJSON.join(","));
+                            $("#lxr").val(NEWJSON1.join(","));
+                        }
+                    });
+                }
+            }
+        });
 
         //联系人
         function getLxr() {

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

@@ -144,6 +144,61 @@
             });
             obj.parent().find(".layui-select-title").find("input").val(value)
         }
+        tableSelect.render({
+            elem: '#ryxm',
+            checkedKey: 'id',
+            searchKey: 'xm',
+            searchPlaceholder: '搜索姓名',
+            table: {
+                url: AjaxUtil.ctx + 'basePerson/rylist',
+                cols: [
+                    [
+                        {type: "radio", fixed: 'left',title: '😊'},
+                        {type: 'numbers', align: 'center',title: '序号'},
+                        {field: 'xm', width: '15%', title: '姓名'},
+                        {field: 'dwmc', title: '公司/单位',width: '60%'}
+                    ]
+                ],
+                done: function (res, curr, count) {
+
+                },
+                page: true
+            },
+            done: function (elem, data) {
+                var NEWJSON = [];
+                var NEWJSON1 = [];
+                var NEWJSON2 = [];
+                var NEWJSON3 = [];
+                var NEWJSON4 = [];
+                var NEWJSON5 = [];
+                var NEWJSON6 = [];
+                var NEWJSON7 = [];
+                var NEWJSON8 = [];
+                var NEWJSON9 = [];
+                layui.each(data.data, function (index, item) {
+                    NEWJSON.push(item.xm);
+                    NEWJSON1.push(item.id);
+                    NEWJSON2.push(item.dw);
+                    NEWJSON3.push(item.dwmc);
+                    NEWJSON4.push(item.dwxz);
+                    NEWJSON5.push(item.dwxzmc);
+                    NEWJSON6.push(item.zc);
+                    NEWJSON7.push(item.zcmc);
+                    NEWJSON8.push(item.xl);
+                    NEWJSON9.push(item.xlmc);
+                })
+                elem.val(NEWJSON.join(","));
+                $("#ry").val(NEWJSON1.join(","));
+                $("#dw").val(NEWJSON2.join(","));
+                $("#dwmc").val(NEWJSON3.join(","));
+                $("#dwlx").val(NEWJSON4.join(","));
+                $("#dwlxmc").val(NEWJSON5.join(","));
+                $("#zc").val(NEWJSON6.join(","));
+                $("#zcmc").val(NEWJSON7.join(","));
+                $("#xl").val(NEWJSON8.join(","));
+                $("#xlmc").val(NEWJSON9.join(","));
+            }
+        })
 
         if ($("#xmjsmc").val() != null && $("xmjsmc").val() != "") {
             set_select('xmjs', $("#xmjsmc").val());

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

@@ -99,7 +99,7 @@
             var zfbl = parseFloat(e.delegateTarget.value);
             if (!isNaN(zfbl)) {
                 var zfje = htInfo.htje * zfbl * 0.01;
-                $("#zfje").val(zfje.toFixed(2));
+                $("#zfje").val(parseFloat(zfje.toFixed(5)));
             }
         });
         //监听提交

src/main/resources/templates/prjpayplan/addXg.html

@@ -99,7 +99,7 @@
             var zfbl = parseFloat(e.delegateTarget.value);
             if (!isNaN(zfbl)) {
                 var zfje = htInfo.htje * zfbl * 0.01;
-                $("#zfje").val(zfje.toFixed(2));
+                $("#zfje").val(parseFloat(zfje.toFixed(5)));
             }
         });
         //监听提交

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

@@ -35,7 +35,7 @@
         </div>
         <div class="layui-form-item">
             <!--            <label class="layui-form-label required" style="width: 90px; margin-left: -20px">支付比例(%)</label>-->
-            <label class="layui-form-label" style="width: 90px; margin-left: -20px">支付比例(%)</label>-->
+            <label class="layui-form-label" style="width: 90px; margin-left: -20px">支付比例(%)</label>
             <div class="layui-input-block">
                 <!--                <input type="number" id="zfbl" name="zfbl" autocomplete="off" th:value="${payplan.zfbl}" class="layui-input" lay-verify="required" lay-reqtext="支付比例不能为空">-->
                 <input type="number" id="zfbl" name="zfbl" autocomplete="off"
@@ -106,7 +106,7 @@
             var zfbl = parseFloat(e.delegateTarget.value);
             if (!isNaN(zfbl)) {
                 var zfje = htInfo.htje * zfbl * 0.01;
-                $("#zfje").val(zfje.toFixed(2));
+                $("#zfje").val(parseFloat(zfje.toFixed(5)));
             }
         });
         var currTable2 = table.render({

src/main/resources/templates/prjpayplan/updateXg.html

@@ -106,7 +106,7 @@
             var zfbl = parseFloat(e.delegateTarget.value);
             if (!isNaN(zfbl)) {
                 var zfje = htInfo.htje * zfbl * 0.01;
-                $("#zfje").val(zfje.toFixed(2));
+                $("#zfje").val(parseFloat(zfje.toFixed(5)));
             }
         });
         var currTable2 = table.render({

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

@@ -432,6 +432,9 @@
 
                         <!-- 右侧悬浮按钮 -->
                         <div class="right-bottom-btn">
+<!--                            <button type="button" class="layui-btn" lay-filter="saveBtn6">-->
+<!--                                <i class="layui-icon layui-icon-ok"></i>保存-->
+<!--                            </button>-->
                             <button class="layui-btn" lay-filter="cancleBtn">
                                 <i class="layui-icon layui-icon-close"></i>关闭
                             </button>
@@ -544,6 +547,7 @@
     var updateflag = 0;
     var prjMember = [];
     var prjCompany = [];
+    // var prjfeescheme=[];
     var subTopic = [];
     var budgetCols = [];
     var dataBudget = new Array();
@@ -566,7 +570,6 @@
             value: new Date(),
             done:function (value,date,endDate) {
                 setTimeout(function () {
-                    console.log('进来了');
                     let qs= $('#qs').val();
                     let wc= $('#wc').val();
                     let qss = new Date(qs);
@@ -595,7 +598,6 @@
             elem: '#wc',
             done:function (value,date,endDate) {
                 setTimeout(function () {
-                    console.log('进来了wc')
                     let qs= $('#qs').val();
                     let wc= $('#wc').val();
                     console.log('qs:'+qs);
@@ -1405,8 +1407,13 @@
                 success: function (result) {
                     dataSubtopic = result.data.rows;
                     prjCompletecompanyListFy =  result.data.prjCompletecompanyListFy;
+                    if (prjCompletecompanyListFy.length>0) {
+                        for (var i = 0; i < dataCompany.length; i++) {
+                            dataBudget[0]['dw' + (i + 1)] = prjCompletecompanyListFy[i].sumjf;
+                        };
+                        setPrjBudge();
+                    }
 //年度预算总和
-
                     document.getElementById('rwsys').value = result.data.sum;
 
                     document.getElementById('rwsys2').value = result.data.sum;
@@ -1920,7 +1927,12 @@
 
                         var ysje = dw1 + dw2 + dw3 + dw4 + dw5 + dw6 + dw7 + dw8 + dw9 + dw10;
 
-
+                        if (dataCompany !=null || dataCompany.length>0) {
+                            for (var i = 0; i < dataCompany.length; i++) {
+                                dataBudget[0]['dw' + (i + 1)] = dataBudget[0]['dw' + (i + 1)] + '/' + prjCompletecompanyListFy[i].sumjf;
+                            }
+                            ;
+                        }
                         if (ysje == 0) {
                             dataBudget[j].ysje = "";
                         } else
@@ -1982,13 +1994,19 @@
                     if ( budgets[0]['dw' + (i + 1)] == null ||  budgets[0]['dw' + (i + 1)] ==''){
                         budgets[0]['dw' + (i + 1)] ==0;
                     }
-                    if (budgets[0]['dw' + (i + 1)] != prjCompletecompanyListFy[i].sumjf ){
+                    let originalValue = dataBudget[0]['dw' + (i + 1)];
+                    let valueBeforeSlash = originalValue.match(/[^\/]+/)[0];
+                    if (valueBeforeSlash != prjCompletecompanyListFy[i].sumjf ){
                         alert("保存失败,"+prjCompletecompanyListFy[i].dwmc+'在子课题单位分工中所有经费总和为:'
                             +prjCompletecompanyListFy[i].sumjf+'万元,请确保所填数据一致!!!')
                         return false
                     }
+                    if (valueBeforeSlash != null && valueBeforeSlash != ''){
+                        budgets[0]['dw' + (i + 1)] =valueBeforeSlash;
+                    }else {
+                        budgets[0]['dw' + (i + 1)] =0;
+                    }
                 }
-
                 var index = layer.load(0, {shade: 0.1});
                 AjaxUtil.post({
                     url: AjaxUtil.ctx + "prjProject/doUpdateXmys",
@@ -2073,9 +2091,27 @@
                     content: AjaxUtil.ctx + 'prjFeescheme/forAdd/' + xmId + '?qs=' + $("#qs").val() + '&wc=' + $("#wc").val() + '&ysjecz=' + $("#rwsys").val(),
                     end: function (index) {
                         // 重载表格
-                        if (updateflag == 1)
+                        if (updateflag == 1) {
                             freshFeescheme();
-                        updateflag = 0;
+                            updateflag = 0;
+                            // var oldData = table.cache["currentTableId6"];
+                            // var item = {
+                            //     "zb" : prjfeescheme.zb,
+                            //     "qs" : prjfeescheme.qs,
+                            //     "wc" : prjfeescheme.wc,
+                            //     "nf" : prjfeescheme.nf,
+                            //     "czdw" : prjfeescheme.czdw,
+                            //     "dwmc" : prjfeescheme.dwmc,
+                            //     "czje" : prjfeescheme.czje,
+                            //     "companys" : prjfeescheme.companys
+                            // };
+                        }
+                        // console.log(item.companys)
+                        // oldData.push(item);
+                        // table.reload('currentTableId6', {
+                        //     data: oldData
+                        // });
+
                         layer.close(index);
                     }
                 });
@@ -2730,6 +2766,14 @@
     function getZktInfo() {
         return subTopic;
     }
+    // //获取出资方案信息
+    // function setCzfa(czfa) {
+    //     prjfeescheme = czfa;
+    // }
+    //
+    // function getCzfa() {
+    //     return prjfeescheme;
+    // }
 </script>
 </body>
 </html>

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

@@ -25,15 +25,15 @@
                     <option th:each="item:${list}" th:text="${item.xm}" th:value="${item.id}"></option>
                 </select>
             </div>
-            <label class="layui-form-label required" style="width: 70px">电话</label>
+            <label class="layui-form-label " style="width: 70px">电话</label>
             <div class="layui-input-inline" style="width: 270px">
-                <input type="text" id="phone" name="phone" lay-reqtext="电话不能为空" lay-verify="required" autocomplete="off" class="layui-input" disabled>
+                <input type="text" id="phone" name="phone"  autocomplete="off" class="layui-input" disabled>
             </div>
         </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
-            <label class="layui-form-label required" style="width: 70px">毕业学校</label>
+            <label class="layui-form-label " style="width: 70px">毕业学校</label>
             <div class="layui-input-inline" style="width: 270px">
-                <input type="text" id="byxx" name="byxx" lay-verify="required" lay-reqtext="毕业学校不能为空" autocomplete="off" class="layui-input" disabled>
+                <input type="text" id="byxx" name="byxx"  autocomplete="off" class="layui-input" disabled>
             </div>
             <label class="layui-form-label" style="width: 70px">专业</label>
             <div class="layui-input-inline" style="width: 270px">
@@ -49,9 +49,10 @@
                     <option th:each="item:${xlList}" th:text="${item.name}" th:value="${item.name}"></option>
                 </select>-->
             </div>
-            <label class="layui-form-label required" style="width: 70px">身份证号</label>
+            <label class="layui-form-label  " style="width: 70px">身份证号</label>
             <div class="layui-input-inline" style="width: 270px">
-                <input type="text" id="sfzh" name="sfzh" lay-verify="required" lay-reqtext="身份证号不能为空" autocomplete="off" class="layui-input" maxlength="18" disabled>
+                <input type="text" id="sfzh" name="sfzh"
+                       autocomplete="off" class="layui-input" maxlength="18" disabled>
             </div>
         </div>