付款新建bug 问题修复，页面编号调整

src/main/java/com/liang/entity/StaPayapproval.java

@@ -86,6 +86,17 @@ public class StaPayapproval implements Serializable {
 
     private String nf;
 
+
+    private Double zfje;
+
+    public Double getZfje() {
+        return zfje;
+    }
+
+    public void setZfje(Double zfje) {
+        this.zfje = zfje;
+    }
+
     public String getNf() {
         return nf;
     }

src/main/resources/mapper/StaPayapprovalDao.xml

@@ -19,6 +19,7 @@
         <result property="erpbh" column="ERPBH" jdbcType="VARCHAR"/>
         <result property="xmmc" column="XMMC" jdbcType="VARCHAR"/>
         <result property="nf" column="NF" jdbcType="VARCHAR"/>
+        <result property="zfje" column="ZFJE" jdbcType="DOUBLE"/>
     </resultMap>
 
     <!--查询单个-->
@@ -30,7 +31,8 @@
                c.HTMC,
                c.WJ   as HTWJ,
                p.JHMC as FKJHMC,
-               b.CJSJ as CJRQ
+               b.CJSJ as CJRQ,
+               p.ZFJE
         from sta_PayApproval b
                  left join prj_PayPlan p on p.ID = b.FKJH
                  left join prj_Contract c on c.ID = b.HT

src/main/resources/mapper/StaTempmemberDao.xml

@@ -317,47 +317,47 @@
 
     <!-- 通过条件查询临时费用信息 -->
     <select id="searchTemeMemberCost" resultType="HashMap">
-        SELECT
-        sta_TempMember.ID,
-        sys_dept_info.dept_name AS BM,
-        sta_BudgetApproval.XMMC,
-        sta_BudgetApproval.SQJE,
-        sta_BudgetApproval.ERPBH,
-        sta_Reimbursement.BZJE,
-        sta_BudgetApproval.BH AS ApprovalBH,
-        sta_BudgetApproval.NF,
-        base_Person.XM AS XMFZR,
-        base_ProjectType.XMLXMC,
-        sta_TempMember.XM,
-        sta_TempMember.SFZH,
-        CAST ( sta_TempMember.QSRQ AS DATE ) AS QSRQ,
-        CAST ( sta_TempMember.JSRQ AS DATE ) AS JSRQ,
-        sta_TempMember.FYSQ,
-        sta_TempMember.BZFY,
-        sta_TempMember.BYXX,
-        sta_TempMember.ZY,
-        sta_TempMember.XL,
-        sta_TempMember.GZDD,
-        sta_BudgetApproval.BH AS BudgetBH,
-        CASE
+            SELECT
+            sta_TempMember.ID,
+            sys_dept_info.dept_name AS BM,
+            sta_BudgetApproval.XMMC,
+            sta_BudgetApproval.SQJE,
+            sta_BudgetApproval.ERPBH,
+            sta_Reimbursement.BZJE,
+            sta_BudgetApproval.BH AS ApprovalBH,
+            sta_BudgetApproval.NF,
+            base_Person.XM AS XMFZR,
+            base_ProjectType.XMLXMC,
+            sta_TempMember.XM,
+            sta_TempMember.SFZH,
+            CAST ( sta_TempMember.QSRQ AS DATE ) AS QSRQ,
+            CAST ( sta_TempMember.JSRQ AS DATE ) AS JSRQ,
+            sta_TempMember.FYSQ,
+            sta_TempMember.BZFY,
+            sta_TempMember.BYXX,
+            sta_TempMember.ZY,
+            sta_TempMember.XL,
+            sta_TempMember.GZDD,
+            sta_BudgetApproval.BH AS BudgetBH,
+            CASE
 
-        WHEN sta_BudgetApproval.SFBYJ = 0 THEN
-        '否'
-        WHEN sta_BudgetApproval.SFBYJ = 1 THEN
-        '是' ELSE CAST ( sta_BudgetApproval.SFBYJ AS VARCHAR ( 11 ) )
-        END AS SFBYJ,
-        CAST ( sta_BudgetApproval.SQSJ AS DATE ) AS SQSJ
-        FROM
-        sta_TempMember
-        LEFT JOIN sta_BudgetApproval ON sta_TempMember.ZB = sta_BudgetApproval.ID
-        LEFT JOIN prj_Project ON sta_BudgetApproval.XMID = prj_Project.ID
-        LEFT JOIN base_Person ON sta_BudgetApproval.XMFZR = base_Person.ID
-        LEFT JOIN sys_dept_info ON sta_BudgetApproval.SSBM = sys_dept_info.dept_id
-        LEFT JOIN base_ProjectType ON sta_BudgetApproval.XMLX = base_ProjectType.XMLX
-        LEFT JOIN sta_Reimbursement ON sta_BudgetApproval.ID = sta_Reimbursement.FYSQ
-        WHERE
-        sta_BudgetApproval.XMMC != 'NULL'
-        AND sta_BudgetApproval.SPZT != '作废'
+            WHEN sta_BudgetApproval.SFBYJ = 0 THEN
+            '否'
+            WHEN sta_BudgetApproval.SFBYJ = 1 THEN
+            '是' ELSE CAST ( sta_BudgetApproval.SFBYJ AS VARCHAR ( 11 ) )
+            END AS SFBYJ,
+            CAST ( sta_BudgetApproval.SQSJ AS DATE ) AS SQSJ
+            FROM
+            sta_TempMember
+            LEFT JOIN sta_BudgetApproval ON sta_TempMember.ZB = sta_BudgetApproval.ID
+            LEFT JOIN prj_Project ON sta_BudgetApproval.XMID = prj_Project.ID
+            LEFT JOIN base_Person ON sta_BudgetApproval.XMFZR = base_Person.ID
+            LEFT JOIN sys_dept_info ON sta_BudgetApproval.SSBM = sys_dept_info.dept_id
+            LEFT JOIN base_ProjectType ON sta_BudgetApproval.XMLX = base_ProjectType.XMLX
+            LEFT JOIN sta_Reimbursement ON sta_BudgetApproval.ID = sta_Reimbursement.FYSQ
+            WHERE
+            sta_BudgetApproval.XMMC != 'NULL'
+            AND sta_BudgetApproval.SPZT != '作废'
         <if test="xmmc != null and xmmc != ''">
             AND sta_BudgetApproval.XMMC LIKE '%'+#{xmmc}+'%'
         </if>

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

@@ -109,7 +109,7 @@
 <!--                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="fyApply">-->
 <!--                    <i class="layui-icon layui-icon-list" style="font-size: 10px;"></i>费用申请-->
 <!--                </button>-->
-                <button class="layui-btn layui-btn-sm" lay-event="exportExcel">
+                <button class="layui-btn layui-btn-sm" lay-event="exportExcel" style="background-color: black">
                     <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出列表
                 </button>
                 <button class="layui-btn layui-btn-sm" lay-event="tongBu" style="background: #FF8040"

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

@@ -38,7 +38,7 @@
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label required" style="width: 60px">合同</label>
             <div class="layui-input-inline" style="width: 380px">
-                <input type="hidden" id="hts" name="hts" class="layui-input" lay-verify="required"
+                <input type="hidden" id="htmc" name="htmc" class="layui-input" lay-verify="required"
                        lay-reqtext="合同名称不能为空">
                 <input type="hidden" id="htes" name="htes" class="layui-input">
                 <select name="ht" id="ht" lay-filter="ht" lay-verify="required" lay-reqtext="合同不能为空" lay-search=“”>
@@ -151,9 +151,12 @@
 
         //监听合同
         form.on('select(ht)', function (data) {
+            var rws = document.getElementById('rwsmc').value;
+            if (rws === null){
+                layer.msg('请先选择任务书！');
+                return false;
 
-
-            console.log('ht'+htList);
+            }
             var len = $("#fkjh")[0].length;
             console.log('len'+len);
             while (len > 1) {
@@ -179,7 +182,6 @@
                         break;
                     }
                 }
-
                 $.ajax({
                     url: AjaxUtil.ctx + 'prjPayplan/list/' + data.value,
                     type: "post",
@@ -202,30 +204,13 @@
             return false;
         });
 
+        // 用于存放验收资料文件
+        var dataYszl = new Array();
+
+        // 用于存放合同文件
+        var dataHtwj = new Array();
         //任务书
         form.on('select(ht)', function (data) {
-            var len = $("#ht")[0].length;
-            while (len > 2)
-                $("#ysrws")[0].options[--len].remove();
-            if (data.value == "") {
-                $("#ysrws").val(0);
-                $("#rws").val('');
-                $("#rwsmc").val('');
-                $("#qs").val('');
-                $("#wc").val('');
-                $("#xmzxq").val('');
-                $("#xmmc").val('');
-                $("#erpbh").val('');
-                $("#xmlx").val('');
-                $("#xmlxmc").val('');
-                $("#xmfzr").val('');
-                $("#xmfzrxm").val('');
-                $("#ssbm").val('');
-                $("#ssbmmc").val('');
-                $("#rwsys").val('');
-                form.render();
-            }
-
             if (data.value == "-1") {
                 parent.layer.open({
                     title: '浏览任务书',
@@ -238,27 +223,56 @@
                         rwsId = localStorage.getItem("rws");
                         var updateflag = localStorage.getItem("updateflag");
                         if (updateflag == "1") {
+                            document.getElementById('htje').value = localStorage.getItem('htje');
                             var htmc = localStorage.getItem("htmc");
                             var id = localStorage.getItem("id");
                             $("#ht").append("<option value=" + id + " selected>" + htmc + "</option>");
-                            $("#htes").val(id);
-                            $("#hts").val(htmc);
-                            $("#htes").val(localStorage.getItem("htmc"));
-                            $('#htje').val(localStorage.getItem('htje'));
+                            document.getElementById('htmc').value = localStorage.getItem('htmc');
+                            var wjString = localStorage.getItem("wj");
+                            var yszlString = localStorage.getItem("yszl");
+                            var wj = JSON.parse(wjString);
+                            var yszl = JSON.parse(yszlString);
+
+                            dataHtwj.splice(0, dataHtwj.length);
+                            dataYszl.splice(0, dataYszl.length);
+                            dataHtwj.push.apply(dataHtwj, wj);
+                            dataYszl.push.apply(dataYszl, yszl);
+
+                            console.log(currTable1);
+                            currTable1.reload();
+                            currTable2.reload();
+
 
                             $.ajax({
-                                url: AjaxUtil.ctx + 'prjPayplan/list/' + id,
+                                url: AjaxUtil.ctx + 'prjPayplan/list/'+id,
                                 type: "post",
                                 async: false,
                                 dataType: "json",
                                 success: function (result) {
-                                    while (len > 1)
-                                        $("#fkjh")[0].options[--len].remove();
-
+                                  /*  while (len > 1)
+                                        $("#fkjh")[0].options[--len].remove();*/
                                     var dataFkjh = result.data.rows;
-                                    for (let item of dataFkjh) {
+                                    console.log('list'+result);
+                                   /* for (let item of dataFkjh) {
                                         $("#fkjh").append("<option value=" + item.id + ">" + item.jhmc + " / " + item.zfje + "</option>");
-                                    }
+                                    }*/
+
+                                    // 假设data是包含合同数据的数组
+                                    // 通过id获取select元素的DOM对象
+                                    console.log('fkjh'+dataFkjh);
+                                    var selectElement = document.getElementById('fkjh');
+                                    // 清空select元素的选项
+                                    selectElement.innerHTML = '';
+                                    // 遍历数据，创建并添加option元素到select元素中
+                                    dataFkjh.forEach(function(item) {
+                                        var optionElement = document.createElement('option');
+                                        optionElement.value = item.id;
+                                        optionElement.innerText = item.jhmc+' / '+item.zfje;
+                                        selectElement.appendChild(optionElement);
+                                    });
+
+
+
                                 }
                             });
 
@@ -319,34 +333,8 @@
                             $("#rws").val(fysqid);
                             $("#rwsmc").val(rwsmc);
                             $("#fysqmc").val(localStorage.getItem("fysqmc"));
+                            $('#fysq').val(fysqid);
                             console.log('这个id是'+fysqid);
-                            if (fysqid != null){
-                                // 根据 费用申请号 ，查询合同数据
-                                AjaxUtil.post({
-                                    url: AjaxUtil.ctx + 'staPayapproval/getHt?fysqid='+fysqid,
-                                    success: function (res) {
-                                        var datas = res.data;
-                                        htList = datas;
-                                        console.log('gtlist'+ htList);
-                                        // 假设data是包含合同数据的数组
-                                        // 通过id获取select元素的DOM对象
-                                        var selectElement = document.getElementById('ht');
-                                        // 清空select元素的选项
-                                        selectElement.innerHTML = '';
-                                        // 遍历数据，创建并添加option元素到select元素中
-                                        datas.forEach(function(item) {
-                                            var optionElement = document.createElement('option');
-                                            optionElement.value = item.id;
-                                            optionElement.innerText = item.htmc;
-                                            selectElement.appendChild(optionElement);
-                                        });
-                                    },
-                                    error: function (error) {
-                                        Message.error(error.message, 1000)
-                                    }
-                                });
-
-                            }
                         } else {
                             $("#ysrws").val(0);
                             $("#rws").val('');

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

@@ -31,7 +31,7 @@
                         </div>
 
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 90px;">编号</label>
+                            <label class="layui-form-label" style="width: 90px;">科研编号</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" name="bh" autocomplete="off" class="layui-input">
                             </div>
@@ -191,16 +191,16 @@
                     {type: 'numbers', fixed: 'left'},
                     {field: 'spzt', width: '11%',title: '审批状态', fixed: 'left'},
                     {field: 'rwsmc', width: '11%', title: '项目名称', fixed: 'left'},
-                    {field: 'bh', width: '11%', title: '费用申请编号'},
+                    {field: 'bh', width: '11%', title: '科研编号'},
                     {field: 'erpbh', width: '10%', title: 'ERP编号'},
                     {field: 'nf',width: '7%',title: '年份'},
                     {field: 'htmc', width: '11%', title: '合同'},
                     {field: 'fysqmc', width: '15%',title: '费用申请'},
-                    {field: 'bcfkje', width: '10%', title: '本次付款金额(万元)'},
+                    {field: 'bcfkje', width: '10%', title: '本次付款金额(万元)',align: 'right'},
                     {field: 'fkjhmc', width: '12%', title: '付款计划'},
                     {field: 'cjrxm', width: '7%', title: '创建人'},
                     {field: 'cjrq', width: '8%', title: '创建时间', align: 'center'},
-                    {field: 'htje', title: '合同金额(万元)' ,width: '8%'}
+                    {field: 'htje', title: '合同金额(万元)' ,width: '8%',align: 'right'}
                 ]
             ],
             autoSort: false,

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

@@ -148,7 +148,7 @@
             console.log(project);
             obj.tr.addClass('layui-bg-blue').siblings().removeClass('layui-bg-blue');
 
-            localStorage.setItem("id", project.fysqid);
+            localStorage.setItem("id", project.id);
             localStorage.setItem("htmc", project.htmc == null ? '' : project.htmc);
             localStorage.setItem("rwsmc", project.rwsmc == null ? '' : project.rwsmc);
             localStorage.setItem("yszl", project.yszl == null ? '' : project.yszl);
@@ -162,7 +162,7 @@
             project = obj.data;
             obj.tr.addClass('layui-bg-blue').siblings().removeClass('layui-bg-blue');
 
-            localStorage.setItem("id", project.fysqid);
+            localStorage.setItem("id", project.id);
             localStorage.setItem("htmc", project.htmc == null ? '' : project.htmc);
             localStorage.setItem("rwsmc", project.rwsmc == null ? '' : project.rwsmc);
             localStorage.setItem("yszl", project.yszl == null ? '' : project.yszl);

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

@@ -25,7 +25,7 @@
                             </select>
                         </div>
                         <label class="layui-form-label" style="width: 60px">费用申请</label>
-                        <div class="layui-input-inline" style="width: 400px">
+                        <div class="layui-input-inline" style="width: 150px">
                             <input type="text" name="fysqmc" autocomplete="off" class="layui-input">
                         </div>
                         <label class="layui-form-label" style="width: 60px">创建人</label>

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

@@ -48,7 +48,7 @@
         </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label required" style="width: 60px">付款计划</label>
-            <input type="hidden" id="fkjhmc" name="fkjhmc" class="layui-input" th:value="${payapproval.fkjhmc}"
+            <input type="hidden" id="fkjhmc" name="fkjhmc" class="layui-input" th:value="${payapproval.fkjhmc}+' / '+${payapproval.zfje}"
                    readonly>
             <div class="layui-input-inline" style="width: 380px">
                 <select name="fkjh" id="fkjh" lay-filter="fkjh" lay-verify="required" lay-reqtext="付款计划不能为空">

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

@@ -42,7 +42,7 @@
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label" style="width: 60px">付款计划</label>
             <div class="layui-input-inline" style="width: 380px">
-                <input type="text" id="fkjhmc" name="fkjhmc" class="layui-input" th:value="${payapproval.fkjhmc}"
+                <input type="text" id="fkjhmc" name="fkjhmc" class="layui-input" th:value="${payapproval.fkjhmc}+' / '+${payapproval.zfje}"
                        readonly>
             </div>
             <label class="layui-form-label" style="width: 130px; margin-left: -10px">本次付款金额(万元)</label>

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

@@ -87,7 +87,7 @@
                     {type: 'numbers', align: 'center'},
                     {field: 'htmc', width: '20%', title: '合同名称', align: 'left'},
                     {field: 'rwsmc', width: '30%', title: '任务书', align: 'left'},
-                    {field: 'htje', width: '10%', title: '合同金额(万元)', align: 'left'},
+                    {field: 'htje', width: '10%', title: '合同金额(万元)', align: 'right'},
                     {field: 'cjrxm', width: '8%', title: '创建人', align: 'center'},
                     {field: 'cjsj', width: '10%', title: '创建时间', align: 'center'}
                 ]

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

@@ -31,7 +31,7 @@
                         </div>
 
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 100px;">费用申请编号</label>
+                            <label class="layui-form-label" style="width: 100px;">科研编号</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" name="fysqbh" autocomplete="off" class="layui-input">
                             </div>
@@ -173,7 +173,7 @@
                     {field: 'spzt', width: '10%',title: '审批状态',fixed: 'left'},
                     {field: 'xmmc', width: '20%', title: '项目名称', fixed: 'left'},
                     {field: 'mc', width: '20%', title: '报账名称', fixed: 'left'},
-                    {field: 'fysqbh', width: '10%',title: '费用申请编号'},
+                    {field: 'fysqbh', width: '10%',title: '科研编号'},
                     {field: 'nf',title: '年份',width: '10%'},
                     {field: 'erpbh', width: '10%',title: 'ERP编号'},
                     {field: 'bzje', width: '8%', title: '报账金额(元)'},

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

@@ -52,7 +52,7 @@
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 70px;">编号</label>
+                            <label class="layui-form-label" style="width: 70px;">科研费号</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" id="bh" name="bh" autocomplete="off" class="layui-input">
                             </div>
@@ -262,7 +262,7 @@
                     {type: "checkbox", fixed: 'left'},
                     {type: 'numbers', align: 'center', fixed: 'left'},
                     {field: 'spzt', width: '10%', title: '审批状态', sort: true},
-                    {field: 'bh', width: '8%', title: '编号'},
+                    {field: 'bh', width: '8%', title: '科研费号'},
                     {field: 'xmmc', width: '25%', title: '项目名称'},
                     {field: 'sqmc', width: '25%', title: '申请名称'},
                     {field: 'erpbh', width: '10%', title: 'ERP编号'},

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

@@ -29,7 +29,7 @@
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 70px; margin-left: -10px">编号</label>
+                            <label class="layui-form-label" style="width: 70px; margin-left: -10px">科研费号</label>
                             <div class="layui-input-inline" style="width: 140px">
                                 <input type="text" id="bh" name="bh" autocomplete="off" class="layui-input">
                             </div>
@@ -146,7 +146,7 @@
                     {type: "checkbox", fixed: 'left'},
                     {type: 'numbers', align: 'center', fixed: 'left'},
                     {field: 'spzt', width: '10%', title: '审批状态', sort: true},
-                    {field: 'bh', width: '9%', title: '编号'},
+                    {field: 'bh', width: '9%', title: '科研费号'},
                     {field: 'xmmc', width: '20%', title: '项目名称'},
                     {field: 'sqmc', width: '25%', title: '申请名称'},
                     {field: 'nf', width: '5%', title: '年份'},

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

@@ -29,7 +29,7 @@
               </div>
             </div>
             <div class="layui-inline">
-              <label class="layui-form-label" style="width: 60px; margin-left: -10px">申请编号</label>
+              <label class="layui-form-label" style="width: 60px; margin-left: -10px">科研费号</label>
               <div class="layui-input-inline" style="width: 150px">
                 <input type="text" id="bh" name="bh" autocomplete="off" class="layui-input">
               </div>
@@ -151,7 +151,7 @@
           {type: 'numbers', align: 'center', fixed: 'left'},
           {field: 'xmmc', width: '15%',title: '项目名称',fixed: "left"},
           {field: 'spzt', width: '10%',title: '审批状态', sort: true},
-          {field: 'bh', width: '9%',title: '编号'},
+          {field: 'bh', width: '9%',title: '科研费号'},
           {field: 'sqmc', width: '25%', title: '申请名称'},
           {field: 'nf', width: '5%', title: '年份'},
           {field: 'sqje', width: '7%', title: '申请金额(元)'},

src/main/resources/templates/stafeemanage/list_allapply.html

@@ -30,7 +30,7 @@
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 90px">编号</label>
+                            <label class="layui-form-label" style="width: 90px">科研费号</label>
                             <div class="layui-input-inline" style="width: 150px">
                                 <input type="text" id="bh" name="bh" autocomplete="off" class="layui-input">
                             </div>
@@ -322,7 +322,7 @@
                     {type: 'numbers', align: 'center', fixed: 'left'},
                     {field: 'xmmc', width: '20%', title: '项目名称',fixed: "left"},
                     {field: 'spzt', width: '9%', title: '审批状态', sort: true},
-                    {field: 'bh', width: '8%', title: '编号'},
+                    {field: 'bh', width: '8%', title: '科研费号'},
                     {field: 'sqmc', width: '25%', title: '申请名称'},
                     {field: 'erpbh', width: '9%', title: 'ERP编号'},
                     {field: 'xmlxmc', width: '10%', title: '项目类型'},

src/main/resources/templates/stafeemanage/list_approving.html

@@ -29,7 +29,7 @@
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 90px">费用申请编号</label>
+                            <label class="layui-form-label" style="width: 90px">科研费号</label>
                             <div class="layui-input-inline" style="width: 150px">
                                 <input type="text" id="bh" name="bh" autocomplete="off" class="layui-input">
                             </div>
@@ -293,7 +293,7 @@
                     {type: 'numbers', align: 'center', fixed: 'left'},
                     {field: 'xmmc', width: '20%', title: '项目名称',fixed: "left"},
                     {field: 'spzt', width: '9%', title: '审批状态', sort: true},
-                    {field: 'bh', width: '8%', title: '编号'},
+                    {field: 'bh', width: '8%', title: '科研费号'},
 
                     // {field: 'sqmc', width: '25%', title: '申请名称'},
                     {field: 'erpbh', width: '9%', title: 'ERP编号'},

src/main/resources/templates/statistical/expertFee.html

@@ -31,13 +31,13 @@
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
-                            <label class="layui-form-label" style="width: 80px;">erp编号</label>
+                            <label class="layui-form-label" style="width: 80px;">ERP编号</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" id="ERPBH" name="ERPBH" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
-                            <label class="layui-form-label" style="width: 80px;">费用申请号</label>
+                            <label class="layui-form-label" style="width: 80px;">科研费号</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" id="FYSQBH" name="FYSQBH" autocomplete="off" class="layui-input">
                             </div>
@@ -156,7 +156,7 @@
                     {field: 'BM', width: '7%', title: '项目部门'},
                     {field: 'XMMC', width: '15%', title: '项目名称', sort: true},
                     {field: 'XMLXMC', width: '10%', title: '项目类型名称'},
-                    {field: 'BH', width: '10%', title: '项目编号'},
+                    {field: 'BH', width: '10%', title: '科研费号'},
                     {field: 'ERPBH', width: '10%', title: 'ERP编号'},
                     {field: 'NF', width: '10%', title: '年份'},
                     {field: 'XMFZR', width: '9%', title: '项目负责人'},

src/main/resources/templates/statistical/indirectCosts.html

@@ -31,13 +31,13 @@
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
-                            <label class="layui-form-label" style="width: 80px;">erp编号</label>
+                            <label class="layui-form-label" style="width: 80px;">ERP编号</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" id="ERPBH" name="ERPBH" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
-                            <label class="layui-form-label" style="width: 80px;">费用申请号</label>
+                            <label class="layui-form-label" style="width: 80px;">科研费号</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" id="FYSQBH" name="FYSQBH" autocomplete="off" class="layui-input">
                             </div>
@@ -140,7 +140,7 @@
                     {type: "checkbox", fixed: 'left'},
                     {type: 'numbers', align: 'center'},
                     {field: 'BM', width: '7%', title: '项目部门'},
-                    {field: 'BH', width: '15%', title: '项目编号', sort: true},
+                    {field: 'BH', width: '15%', title: '科研费号', sort: true},
                     {field: 'ERPBH', width: '15%', title: 'ERP编号', sort: true},
                     {field: 'NF', width: '7%', title: '年份', sort: true},
                     {field: 'XMMC', width: '15%', title: '项目名称', sort: true},

src/main/resources/templates/statistical/material.html

@@ -31,13 +31,13 @@
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
-                            <label class="layui-form-label" style="width: 80px;">erp编号</label>
+                            <label class="layui-form-label" style="width: 80px;">ERP编号</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" id="ERPBH" name="ERPBH" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
-                            <label class="layui-form-label" style="width: 80px;">费用申请号</label>
+                            <label class="layui-form-label" style="width: 80px;">科研编号</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" id="FYSQBH" name="FYSQBH" autocomplete="off" class="layui-input">
                             </div>
@@ -163,7 +163,7 @@
                     {field: 'XMBH', width: '7%', title: '项目编号'},
                     {field: 'SLL', width: '7%', title: '数量'},
                     {field: 'NF',width: '5%',title:'年份'},
-                    {field: 'BH',width: '7%',title: '费用申请编号'},
+                    {field: 'BH',width: '10%',title: '科研编号'},
                     {field: 'XMMC', width: '15%', title: '项目名称', sort: true},
                     {field: 'XMLXMC', width: '10%', title: '项目类型'},
                     {field: 'CLMC', width: '10%', title: '材料名称'},

src/main/resources/templates/statistical/outPay.html

@@ -31,13 +31,13 @@
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
-                            <label class="layui-form-label" style="width: 80px;">erp编号</label>
+                            <label class="layui-form-label" style="width: 80px;">ERP编号</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" id="ERPBH" name="ERPBH" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
-                            <label class="layui-form-label" style="width: 80px;">费用申请号</label>
+                            <label class="layui-form-label" style="width: 80px;">科研费号</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" id="FYSQBH" name="FYSQBH" autocomplete="off" class="layui-input">
                             </div>

src/main/resources/templates/statistical/printingFee.html

@@ -31,13 +31,13 @@
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
-                            <label class="layui-form-label" style="width: 80px;">erp编号</label>
+                            <label class="layui-form-label" style="width: 80px;">ERP编号</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" id="ERPBH" name="ERPBH" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
-                            <label class="layui-form-label" style="width: 80px;">费用申请号</label>
+                            <label class="layui-form-label" style="width: 80px;">科研费号</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" id="FYSQBH" name="FYSQBH" autocomplete="off" class="layui-input">
                             </div>
@@ -143,7 +143,7 @@
                     {field: 'XMMC', width: '15%', title: '项目名称', sort: true},
                     {field: 'BM', width: '7%', title: '项目部门'},
                     {field: 'ERPBH', width: '10%', title: '项目编号'},
-                    {field: 'BH', width: '10%', title: '申请科研费号'},
+                    {field: 'BH', width: '10%', title: '科研费号'},
                     {field: 'NF', width: '7%', title: '年份'},
                     {field: 'XMLXMC', width: '10%', title: '项目类型'},
                     {field: 'XMFZR', width: '9%', title: '项目负责人'},

src/main/resources/templates/statistical/sourceFee.html

@@ -32,13 +32,13 @@
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
-                            <label class="layui-form-label" style="width: 80px;">erp编号</label>
+                            <label class="layui-form-label" style="width: 80px;">ERP编号</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" id="ERPBH" name="ERPBH" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
-                            <label class="layui-form-label" style="width: 80px;">费用申请号</label>
+                            <label class="layui-form-label" style="width: 80px;">科研费号</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" id="FYSQBH" name="FYSQBH" autocomplete="off" class="layui-input">
                             </div>

src/main/resources/templates/statistical/tempMember.html

@@ -31,13 +31,13 @@
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
-                            <label class="layui-form-label" style="width: 80px;">erp编号</label>
+                            <label class="layui-form-label" style="width: 80px;">ERP编号</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" id="ERPBH" name="ERPBH" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
-                            <label class="layui-form-label" style="width: 80px;">费用申请号</label>
+                            <label class="layui-form-label" style="width: 80px;">科研费号</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" id="FYSQBH" name="FYSQBH" autocomplete="off" class="layui-input">
                             </div>
@@ -163,7 +163,7 @@
                     {field: 'BM', width: '7%', title: '项目部门'},
                     {field: 'XMLXMC',width: '10%',title: '项目类型'},
                     {field: 'ERPBH',width: '10%',title: 'ERP编号'},
-                    {field: 'ApprovalBH', width: '15%', title: '科研费号'},
+                    {field: 'ApprovalBH', width: '10%', title: '科研费号'},
                     {field: 'NF',width: '5%',title: '年份'},
                     {field: 'XMFZR', width: '7%', title: '项目负责人'},
                     {field: 'XM', width: '9%', title: '临聘人员姓名'},