Commit 9416f0a1 by LIDINGDA\ldd

1.修改动画可配置2.修复退款按钮选中问题

parent cdcd1627
...@@ -9,7 +9,7 @@ FMPePay::FMPePay(ctkPluginContext *context) ...@@ -9,7 +9,7 @@ FMPePay::FMPePay(ctkPluginContext *context)
: FMPePayInterface(context), : FMPePayInterface(context),
_url(DEFAULT_EPAY_RWQUESTURL), _url(DEFAULT_EPAY_RWQUESTURL),
_inited(false), _inited(false),
_needanimation(false), //_needanimation(false),
_databasename(DEFAULT_EPAY_DATABASENAME), _databasename(DEFAULT_EPAY_DATABASENAME),
_table(DEFAULT_EPAY_TABLE), _table(DEFAULT_EPAY_TABLE),
_businessdate(QDateTime::currentDateTime().toString("yyyy-MM-dd")), _businessdate(QDateTime::currentDateTime().toString("yyyy-MM-dd")),
......
...@@ -30,7 +30,7 @@ protected slots: ...@@ -30,7 +30,7 @@ protected slots:
private: private:
bool _inited; bool _inited;
bool _needanimation; //bool _needanimation;
QString _url; QString _url;
QString _databasename; QString _databasename;
QString _table; QString _table;
......
#ifndef FMP_EPAY_DEF #ifndef FMP_EPAY_DEF
#define FMP_EPAY_DEF #define FMP_EPAY_DEF
#include <fmp_settings_i.h>
//公用字段 //公用字段
#define FMP_EPAY_VER "ver" #define FMP_EPAY_VER "ver"
#define FMP_EPAY_CLIENTREQCOUNT "clientReqCount" #define FMP_EPAY_CLIENTREQCOUNT "clientReqCount"
......
...@@ -138,13 +138,14 @@ void FMPePayPrivate::Init() ...@@ -138,13 +138,14 @@ void FMPePayPrivate::Init()
QVariantHash hash; QVariantHash hash;
hash[FMP_EPAY_ANIMATION] = q->_needanimation; _setting = q->GetService<FMPSettingsInterface>(q->_ctx);
hash[FMP_EPAY_ANIMATION] = _setting->GetBool(FMP_INIKEY_ANIMATION);
hash[FMP_EPAY_BUSINESSDATE] = q->_businessdate; hash[FMP_EPAY_BUSINESSDATE] = q->_businessdate;
hash[FMP_EPAY_STOREID] = q->_store_id; hash[FMP_EPAY_STOREID] = q->_store_id;
hash[FMP_EPAY_STATIONID] = q->_station_id; hash[FMP_EPAY_STATIONID] = q->_station_id;
hash[FMP_EPAY_OPERATORID] = q->_operator_id; hash[FMP_EPAY_OPERATORID] = q->_operator_id;
_setting = q->GetService<FMPSettingsInterface>(q->_ctx);
_payDialog = new FMPPayDialog(this, hash); _payDialog = new FMPPayDialog(this, hash);
} }
......
...@@ -93,6 +93,8 @@ FMPPayDialog::FMPPayDialog(FMPePayPrivate *control, QVariantHash basicinfo, QWid ...@@ -93,6 +93,8 @@ FMPPayDialog::FMPPayDialog(FMPePayPrivate *control, QVariantHash basicinfo, QWid
ui->lineedit_num->setFocus(); ui->lineedit_num->setFocus();
_current_LineEdit = ui->lineedit_num; _current_LineEdit = ui->lineedit_num;
ui->tableView->setEditTriggers(QAbstractItemView::NoEditTriggers);
ui->tableView->setItemDelegate(new FMPPayItemDelegate); ui->tableView->setItemDelegate(new FMPPayItemDelegate);
connect(ui->tableView, SIGNAL(clicked(QModelIndex)), SLOT(onSelectionChanged(QModelIndex))); connect(ui->tableView, SIGNAL(clicked(QModelIndex)), SLOT(onSelectionChanged(QModelIndex)));
...@@ -649,4 +651,5 @@ void FMPPayDialog::on_btn_backspace_refund_clicked() ...@@ -649,4 +651,5 @@ void FMPPayDialog::on_btn_backspace_refund_clicked()
void FMPPayDialog::on_lineEdit_textChanged(const QString &arg1) void FMPPayDialog::on_lineEdit_textChanged(const QString &arg1)
{ {
_control->GetCheckMode(arg1); _control->GetCheckMode(arg1);
ui->pushButton_2->setEnabled(false);
} }
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 1 #define VER_MINOR 1
#define VER_REVISION 0 #define VER_REVISION 0
#define VER_BUILD 6 #define VER_BUILD 7
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment