From 9ac9cc9e9cd91b97d35a6e28400df71630765e40 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 21 八月 2024 14:35:51 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/BasicCode/ShipcompanyMaint.cpp | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/jrj/project/business/BasicCode/ShipcompanyMaint.cpp b/jrj/project/business/BasicCode/ShipcompanyMaint.cpp
index 1d88656..8763d38 100644
--- a/jrj/project/business/BasicCode/ShipcompanyMaint.cpp
+++ b/jrj/project/business/BasicCode/ShipcompanyMaint.cpp
@@ -3,12 +3,14 @@
#include <xcontrol/xdwgrid.hpp>
#include <wobject/xdouble.hpp>
#include <xcontrol/xlayersheet.hpp>
+#include <xcontrol/xcell.hpp>
#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
+#include "vbusiness/vframe/maint.vframe.vbusiness.hpp"
#include "viewobject/view.base.hpp"
using xml = KXMLDOMDocument;
-class __declspec(dllexport) ShipcompanyMaint : public xframe
+class __declspec(dllexport) ShipcompanyMaint : public maint
{
public:
KXMLDOMDocument m_configDoc;
@@ -16,21 +18,17 @@
xstring m_username;
xstring ContactID;
xdwtable dw_base;
+ xstring m_EntityID = L"";
xcell dw_cell;
public:
- ShipcompanyMaint(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd) {}
+ ShipcompanyMaint(void* implPtr, HWND hWnd) :maint(implPtr, hWnd) {}
public:
static ShipcompanyMaint* CreateInstance(void* implPtr, void* hWnd)
{
ShipcompanyMaint* pWin = new ShipcompanyMaint(implPtr, (HWND)hWnd);
return pWin;
}
- int alert(xstring str)
- {
- //win::MessageBox(GetHWND(),str,L"提示22:",0);
- TApp::alert(this, str);
- return 0;
- }
+
int setCellReadOnly()
{
dw_base = new xdwtable;
@@ -315,6 +313,6 @@
maint::onload();
OnClear();
-
+ return 1;
}
};
\ No newline at end of file
--
Gitblit v1.9.3