From 29bdfdc723549d1b9abf61971f6a94f7804b7b37 Mon Sep 17 00:00:00 2001 From: xiechao <768159101@qq.com> Date: Tue, 30 Apr 2024 15:07:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=8D=95=E6=8D=AE=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xxgl/xmkpgl/fybx/FybxController.java | 4 ++-- .../resources/mapper/mysql/xxgl/FybxMapper.xml | 9 ++++++--- .../static/zzsxt/xxgl/xmkpgl/fybx/index_add.js | 2 +- .../zzsxt/xxgl/xmkpgl/fybx/index_edit.js | 2 +- .../zzsxt/xxgl/xmkpgl/fybx/index_util.js | 18 +++++++----------- .../zzsxt/xxgl/xmkpgl/fybx/index_add.html | 15 ++++++++++++--- .../zzsxt/xxgl/xmkpgl/fybx/index_edit.html | 14 +++++++++++++- 7 files changed, 42 insertions(+), 22 deletions(-) diff --git a/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/fybx/FybxController.java b/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/fybx/FybxController.java index bf7adf7..d88911a 100644 --- a/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/fybx/FybxController.java +++ b/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/fybx/FybxController.java @@ -194,14 +194,14 @@ public class FybxController extends BaseController { JSONObject fydj = new JSONObject(); fydj.put("djbh", data.get("DJBH")); // 单据编号 if (ObjectUtil.isNotEmpty(data.get("DJRQ"))) { - fydj.put("djrq", DateUtil.format(DateUtil.date(data.getLong("DJRQ")), "yyyy-MM-dd")); // 单据日期 格式：yyyy-MM-dd + fydj.put("djrq", data.get("DJRQ")); // 单据日期 格式：yyyy-MM-dd } fydj.put("djlx", data.get("DJLX")); // 单据类型 fydj.put("djje", data.get("DJJE")); // 单据金额 fydj.put("djse", data.get("DJSE")); // 单据税额 fydj.put("bxr", data.get("BXR")); // 报销人 if (ObjectUtil.isNotEmpty(data.get("BXSJ"))) { - fydj.put("bxsj", DateUtil.format(DateUtil.date(data.getLong("BXSJ")), "yyyy-MM-dd HH:mm:ss")); // 报销时间 yyyy-MM-dd HH:mm:ss + fydj.put("bxsj", data.get("BXSJ")); // 报销时间 yyyy-MM-dd HH:mm:ss } fydj.put("bxsy", data.get("BXSY")); // 报销事由 fydj.put("bxzt", data.get("BXZT")); // 报销状态：1.未报销 2.报销中 3.已报销 diff --git a/src/main/resources/mapper/mysql/xxgl/FybxMapper.xml b/src/main/resources/mapper/mysql/xxgl/FybxMapper.xml index 5261878..c782238 100644 --- a/src/main/resources/mapper/mysql/xxgl/FybxMapper.xml +++ b/src/main/resources/mapper/mysql/xxgl/FybxMapper.xml @@ -40,6 +40,7 @@ SSBM, ZW, BZ, + PHONE, #{FYID}, @@ -56,7 +57,8 @@ #{KHMC}, #{SSBM}, #{ZW}, - #{BZ} + #{BZ}, + #{PHONE} @@ -75,7 +77,8 @@ KHMC = #{KHMC}, SSBM = #{SSBM}, ZW = #{ZW}, - BZ = #{BZ} + BZ = #{BZ}, + PHONE = #{PHONE} WHERE FYID = #{FYID} @@ -167,4 +170,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/static/zzsxt/xxgl/xmkpgl/fybx/index_add.js b/src/main/resources/static/zzsxt/xxgl/xmkpgl/fybx/index_add.js index 9272c46..8971cd0 100644 --- a/src/main/resources/static/zzsxt/xxgl/xmkpgl/fybx/index_add.js +++ b/src/main/resources/static/zzsxt/xxgl/xmkpgl/fybx/index_add.js @@ -80,7 +80,7 @@ var kpsq_add =(function(){ data["FYMX_list"] = JSON.stringify(kpxxList); data["DJBH"] = $("#DJBH").val(); data["DJRQ"] = $("#DJRQ").val(); - data["DJLX"] = $("#DJLX_DM").val(); + data["DJLX"] = $("#DJLX").val(); data["DJJE"] = $("#DJJE").val(); data["DJSE"] = $("#DJSE").val(); data["BXR"] = $("#BXR").val(); 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 22e62aa..8ef5cd6 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 @@ -97,13 +97,13 @@ var kpsq_edit = (function () { data["DJSE"] = $("#DJSE").val(); data["BXR"] = $("#BXR").val(); data["BXSY"] = $("#BXSY").val(); - data["BXSY"] = $("#BXSY").val(); data["KHSH"] = $("#KHSH").val(); data["KHMC"] = $("#KHMC").val(); data["SSBM"] = $("#SSBM").val(); data["ZW"] = $("#ZW").val(); data["BZ"] = $("#BZ").val(); data["FYID"] = $("#FYID").val(); + data["PHONE"] = $("#PHONE").val(); var url = "/web/xxgl/xmkpgl/fybx/insert";// 新增费用报销，新增和修改页面保存操作调用的是同一个后台方法 baseTools.xhrAjax({ diff --git a/src/main/resources/static/zzsxt/xxgl/xmkpgl/fybx/index_util.js b/src/main/resources/static/zzsxt/xxgl/xmkpgl/fybx/index_util.js index e57a9bf..1049f28 100644 --- a/src/main/resources/static/zzsxt/xxgl/xmkpgl/fybx/index_util.js +++ b/src/main/resources/static/zzsxt/xxgl/xmkpgl/fybx/index_util.js @@ -1,11 +1,8 @@ var FybxUtil = (function (){ var DJLX = [ - {value: "1",label: "办公费用"}, - {value: "2",label: "通讯费"}, - {value: "3",label: "差旅费"}, - {value: "4",label: "业务费用"}, - {value: "5",label: "车辆费用"}, + {value: "1",label: "个人报销"}, + {value: "2",label: "对公报销"}, ]; var BXZT = [ @@ -15,11 +12,10 @@ var FybxUtil = (function (){ ]; var FYLX = [ - {value: "1",label: "办公费用"}, - {value: "2",label: "通讯费"}, - {value: "3",label: "差旅费"}, - {value: "4",label: "业务费用"}, - {value: "5",label: "车辆费用"}, + {value: "01",label: "出差补助"}, + {value: "02",label: "出差车费及机票费"}, + {value: "03",label: "市内交通费"}, + {value: "04",label: "住宿费"}, ]; @@ -53,4 +49,4 @@ var FybxUtil = (function (){ } } }; -})(); \ No newline at end of file +})(); diff --git a/src/main/resources/templates/zzsxt/xxgl/xmkpgl/fybx/index_add.html b/src/main/resources/templates/zzsxt/xxgl/xmkpgl/fybx/index_add.html index 2ec2154..ca3f941 100644 --- a/src/main/resources/templates/zzsxt/xxgl/xmkpgl/fybx/index_add.html +++ b/src/main/resources/templates/zzsxt/xxgl/xmkpgl/fybx/index_add.html @@ -134,6 +134,18 @@ /> +
+ +
+ +
+
@@ -230,9 +242,6 @@ 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 ba37e66..b42eef4 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 @@ -134,6 +134,18 @@ />
+
+ +
+ +
+
@@ -276,4 +288,4 @@
- \ No newline at end of file +