diff --git a/web/Application/SLN0002/DAO/VoucherDAO.class.php b/web/Application/SLN0002/DAO/VoucherDAO.class.php index 479fb674..c1eef380 100644 --- a/web/Application/SLN0002/DAO/VoucherDAO.class.php +++ b/web/Application/SLN0002/DAO/VoucherDAO.class.php @@ -49,7 +49,9 @@ class VoucherDAO extends PSIBaseExDAO $start = $params["start"]; $limit = $params["limit"]; - $sql = "select id, v_status, v_word, ref, v_dt + $sql = "select id, v_status, v_word, ref, v_dt, input_user_name, input_dt, + confirm_user_name, gl_user_name, gl_dt, charge_user_name, + cash_user_name, biz_user_name, bill_number from t_voucher where (company_id = '%s') and (v_year = %d) and (v_month = %d)"; $queryParams = []; @@ -86,6 +88,8 @@ class VoucherDAO extends PSIBaseExDAO "word" => $v["v_word"], "ref" => $v["ref"], "voucherDT" => $this->toYMD($v["v_dt"]), + "inputUserName" => $v["input_user_name"], + "inputDT" => $v["input_dt"], ]; } diff --git a/web/Public/Scripts/PSI/SLN0002/Voucher/MainForm.js b/web/Public/Scripts/PSI/SLN0002/Voucher/MainForm.js index dd03b9f1..56cc7e32 100644 --- a/web/Public/Scripts/PSI/SLN0002/Voucher/MainForm.js +++ b/web/Public/Scripts/PSI/SLN0002/Voucher/MainForm.js @@ -574,6 +574,7 @@ PCL.define("PSI.SLN0002.Voucher.MainForm", { fields: ["id", "voucherStatus", "word", "ref", "voucherDT", "confirmUserName", "confirmDT", "glUserName", "glDT", "chargeUserName", "cashUserName", "bizUserName", "billNumber", "orgName", + "inputUserName", "inputDT", ] }); const store = PCL.create("PCL.data.Store", { @@ -652,7 +653,7 @@ PCL.define("PSI.SLN0002.Voucher.MainForm", { sortable: false }, { header: "制单时间", - dataIndex: "dateCreated", + dataIndex: "inputDT", width: 150, menuDisabled: true, sortable: false