From b0c7e33b597c29a207cd9d01090bbc61d71825a4 Mon Sep 17 00:00:00 2001
From: jiaxudong <sookdong@163.com>
Date: Fri, 26 Apr 2024 16:55:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E6=8A=A5=E9=94=80=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xxgl/xmkpgl/fybx/FybxServiceImpl.java     |  1 +
 .../mapper/mysql/xxgl/FybxMapper.xml          | 67 +++++++++++++------
 .../zzsxt/xxgl/xmkpgl/fybx/index_edit.js      | 13 ++--
 .../zzsxt/xxgl/xmkpgl/fybx/index_edit.html    |  2 +-
 4 files changed, 56 insertions(+), 27 deletions(-)

diff --git a/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/fybx/FybxServiceImpl.java b/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/fybx/FybxServiceImpl.java
index b891786..9187c3d 100644
--- a/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/fybx/FybxServiceImpl.java
+++ b/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/fybx/FybxServiceImpl.java
@@ -55,6 +55,7 @@ public class FybxServiceImpl implements IFybxService {
         } else {
             userMap.put("FYID", Get16BM.getUnquieID());
             userMap.put("BXSJ", DateUtil.date());
+            userMap.put("BXZT", 1);
             // 保存费用单据
             result = this.fybxMapper.insertZZSGL_JX_FYDJ(userMap);
         }
diff --git a/src/main/resources/mapper/mysql/xxgl/FybxMapper.xml b/src/main/resources/mapper/mysql/xxgl/FybxMapper.xml
index 9423c28..6fd914d 100644
--- a/src/main/resources/mapper/mysql/xxgl/FybxMapper.xml
+++ b/src/main/resources/mapper/mysql/xxgl/FybxMapper.xml
@@ -24,29 +24,58 @@
     </select>
     <insert id="insertZZSGL_JX_FYDJ" parameterType="map">
         INSERT INTO ZZSGL_JX_FYDJ(
-            FYID, DJBH, DJRQ, DJLX, DJJE, DJSE, BXR, BXSJ, BXZT, BXSY, KHSH, KHMC, SSBM, ZW, BZ
+            <if test="FYID!=null and FYID!=''">FYID, </if>
+            <if test="DJBH!=null and DJBH!=''">DJBH, </if>
+            <if test="DJRQ!=null and DJRQ!=''">DJRQ, </if>
+            <if test="DJLX!=null and DJLX!=''">DJLX, </if>
+            <if test="DJJE!=null and DJJE!=''">DJJE, </if>
+            <if test="DJSE!=null and DJSE!=''">DJSE, </if>
+            <if test="BXR!=null and BXR!=''">BXR, </if>
+            <if test="BXSJ!=null and BXSJ!=''">BXSJ, </if>
+            <if test="BXZT!=null and BXZT!=''">BXZT, </if>
+            <if test="BXSY!=null and BXSY!=''">BXSY, </if>
+            <if test="KHSH!=null and KHSH!=''">KHSH, </if>
+            <if test="KHMC!=null and KHMC!=''">KHMC, </if>
+            <if test="SSBM!=null and SSBM!=''">SSBM, </if>
+            <if test="ZW!=null and ZW!=''">ZW, </if>
+            <if test="BZ!=null and BZ!=''">BZ, </if>
         ) VALUES (
-                             #{FYID},#{DJBH},#{DJRQ}, #{DJLX}, #{DJJE}, #{DJSE}, #{BXR},
-                             #{BXSJ}, #{BXZT}, #{BXSY}, #{KHSH}, #{KHMC}, #{SSBM}, #{ZW}, #{BZ}
+            <if test="FYID!=null and FYID!=''">#{FYID}, </if>
+            <if test="DJBH!=null and DJBH!=''">#{DJBH}, </if>
+            <if test="DJRQ!=null and DJRQ!=''">#{DJRQ}, </if>
+            <if test="DJLX!=null and DJLX!=''">#{DJLX}, </if>
+            <if test="DJJE!=null and DJJE!=''">#{DJJE}, </if>
+            <if test="DJSE!=null and DJSE!=''">#{DJSE}, </if>
+            <if test="BXR!=null and BXR!=''">#{BXR}, </if>
+            <if test="BXSJ!=null and BXSJ!=''">#{BXSJ}, </if>
+            <if test="BXZT!=null and BXZT!=''">#{BXZT}, </if>
+            <if test="BXSY!=null and BXSY!=''">#{BXSY}, </if>
+            <if test="KHSH!=null and KHSH!=''">#{KHSH}, </if>
+            <if test="KHMC!=null and KHMC!=''">#{KHMC}, </if>
+            <if test="SSBM!=null and SSBM!=''">#{SSBM}, </if>
+            <if test="ZW!=null and ZW!=''">#{ZW}, </if>
+            <if test="BZ!=null and BZ!=''">#{BZ} </if>
         )
     </insert>
     <insert id="updateZZSGL_JX_FYDJ" parameterType="map">
-        UPDATE ZZSGL_JX_FYDJ SET
-            DJBH = #{DJBH},
-            DJRQ = #{DJRQ},
-            DJLX = #{DJLX},
-            DJJE = #{DJJE},
-            DJSE = #{DJSE},
-            BXR = #{BXR},
-            BXSJ = #{BXSJ},
-            BXZT = #{BXZT},
-            BXSY = #{BXSY},
-            KHSH = #{KHSH},
-            KHMC = #{KHMC},
-            SSBM = #{SSBM},
-            ZW = #{ZW},
-            BZ = #{BZ}
-            WHERE FYID = #{FYID}
+        UPDATE ZZSGL_JX_FYDJ
+        <set>
+            <if test="DJBH!=null and DJBH!=''">DJBH = #{DJBH}, </if>
+            <if test="DJRQ!=null and DJRQ!=''">DJRQ = #{DJRQ}, </if>
+            <if test="DJLX!=null and DJLX!=''">DJLX = #{DJLX}, </if>
+            <if test="DJJE!=null and DJJE!=''">DJJE = #{DJJE}, </if>
+            <if test="DJSE!=null and DJSE!=''">DJSE = #{DJSE}, </if>
+            <if test="BXR!=null and BXR!=''">BXR = #{BXR}, </if>
+            <if test="BXSJ!=null and BXSJ!=''">BXSJ = #{BXSJ}, </if>
+            <if test="BXZT!=null and BXZT!=''">BXZT = #{BXZT}, </if>
+            <if test="BXSY!=null and BXSY!=''">BXSY = #{BXSY}, </if>
+            <if test="KHSH!=null and KHSH!=''">KHSH = #{KHSH}, </if>
+            <if test="KHMC!=null and KHMC!=''">KHMC = #{KHMC}, </if>
+            <if test="SSBM!=null and SSBM!=''">SSBM = #{SSBM}, </if>
+            <if test="ZW!=null and ZW!=''">ZW = #{ZW}, </if>
+            <if test="BZ!=null and BZ!=''">BZ = #{BZ} </if>
+        </set>
+        WHERE FYID = #{FYID}
     </insert>
 
     <delete id="updateBxztById" parameterType="map">
diff --git a/src/main/resources/static/zzsxt/xxgl/xmkpgl/fybx/index_edit.js b/src/main/resources/static/zzsxt/xxgl/xmkpgl/fybx/index_edit.js
index d6ef7c9..6913139 100644
--- a/src/main/resources/static/zzsxt/xxgl/xmkpgl/fybx/index_edit.js
+++ b/src/main/resources/static/zzsxt/xxgl/xmkpgl/fybx/index_edit.js
@@ -25,9 +25,12 @@ var kpsq_edit = (function () {
         var tableType = [{
             "table_id": "tbSave_fymx",//动态表ID
             "tr_id": "trid_fymx", //新增行模板ID
-            "rowno_name": "rowno_kpmx",
+            "rowno_name": "rowno_fymx",
             "rowno_type": "span"
         }];
+        // 表格重置之前 初始化select组件
+        initFylxSelect();
+        // 表格重置
         tablePublic.onReset(curSeg, tableType);
 
         var djlxOptions = [];
@@ -37,7 +40,6 @@ var kpsq_edit = (function () {
         });
         $("#DJLX").html(djlxOptions.join());
 
-        initFylxSelect();
 
         layui.use(['form'], function () {
             form = layui.form;
@@ -57,7 +59,7 @@ var kpsq_edit = (function () {
             fylxOptions.push('<option value="' + item.value + '" >' + item.label + '</option>');
         });
         $("select[name=FYLX]").html(fylxOptions.join());
-        // console.log($("select[name=FYLX]").html());
+        // console.log($("select[name=FYLX]"));
     }
 
     //共有方法
@@ -89,10 +91,7 @@ var kpsq_edit = (function () {
         bindData: function (jsonObj, xhrArgs) {
             tablePublic.onResetTable(tableId);
             tablePublic.onInsertData(jsonObj.data, tableId);
-            setTimeout(function () {
-                initFylxSelect();
-                layui.form.render('select'); // 重新渲染 select 组件
-            }, 100);
+            layui.form.render('select'); // 重新渲染 select 组件
         },
 
         onSavePre: function () {
diff --git a/src/main/resources/templates/zzsxt/xxgl/xmkpgl/fybx/index_edit.html b/src/main/resources/templates/zzsxt/xxgl/xmkpgl/fybx/index_edit.html
index 8a74992..fee439e 100644
--- a/src/main/resources/templates/zzsxt/xxgl/xmkpgl/fybx/index_edit.html
+++ b/src/main/resources/templates/zzsxt/xxgl/xmkpgl/fybx/index_edit.html
@@ -224,7 +224,7 @@
                                     <input type="hidden" name="FYMXID"/>
                                     <input type="hidden" name="FYID"/>
                                     <input type="hidden" name="FPID"/>
-                                    <span name="rowno_kpmx">1</span>
+                                    <span name="rowno_fymx">1</span>
                                     <input type="hidden" name="ROWTYPE" value="NEW" />
                                 </td>
                                 <td>