lu
2024-10-26 070f0fafe269de02a126b39dc21c5abe3024da80
增加批准按钮
已修改3个文件
135 ■■■■■ 文件已修改
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx 104 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -56,6 +56,7 @@
            this.btnDesign = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnJianYan = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnFjianYan = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnPiZhun = new DevExpress.XtraBars.BarLargeButtonItem();
            this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
            this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
            this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
@@ -111,9 +112,10 @@
            this.btnQuery,
            this.btnDesign,
            this.btnJianYan,
            this.btnFjianYan});
            this.btnFjianYan,
            this.btnPiZhun});
            this.barManager1.MainMenu = this.bar2;
            this.barManager1.MaxItemId = 29;
            this.barManager1.MaxItemId = 30;
            // 
            // bar2
            // 
@@ -141,7 +143,8 @@
            new DevExpress.XtraBars.LinkPersistInfo(this.btnReport),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnDesign),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnJianYan),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnFjianYan)});
            new DevExpress.XtraBars.LinkPersistInfo(this.btnFjianYan),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnPiZhun)});
            this.bar2.OptionsBar.MultiLine = true;
            this.bar2.OptionsBar.UseWholeRow = true;
            this.bar2.Text = "Main menu";
@@ -353,6 +356,15 @@
            this.btnFjianYan.Name = "btnFjianYan";
            this.btnFjianYan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnPiZhun
            //
            this.btnPiZhun.Caption = "批准";
            this.btnPiZhun.Id = 29;
            this.btnPiZhun.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.boposition2_16x161;
            this.btnPiZhun.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.boposition2_32x32;
            this.btnPiZhun.Name = "btnPiZhun";
            this.btnPiZhun.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            //
            // barDockControlTop
            // 
            this.barDockControlTop.CausesValidation = false;
@@ -422,5 +434,6 @@
        private DevExpress.XtraBars.BarLargeButtonItem btnDesign;
        private DevExpress.XtraBars.BarLargeButtonItem btnJianYan;
        private DevExpress.XtraBars.BarLargeButtonItem btnFjianYan;
        private DevExpress.XtraBars.BarLargeButtonItem btnPiZhun;
    }
}
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -37,12 +37,18 @@
            btnFchk.ItemClick += BtnFchk_ItemClick;
            btnJianYan.ItemClick += BtnJianYan_ItemClick;
            btnFjianYan.ItemClick += BtnFjianYan_ItemClick;
            btnPiZhun.ItemClick += BtnPiZhun_ItemClick;
            var lst = new List<string>();
            foreach (BarItem item in barManager1.Items)
                if (item is BarLargeButtonItem largeButtonItem)
                    if (!string.IsNullOrEmpty(item.Caption))
                        lst.Add(item.Caption);
            actions = lst;
        }
        private void BtnPiZhun_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnPiZhunClick != null) btnPiZhunClick(this, e);
        }
@@ -631,6 +637,12 @@
        /// </summary>
        public event EventHandler btnFjianYanClick;
        /// <summary>
        ///     新增
        /// </summary>
        public event EventHandler btnPiZhunClick;
        #endregion
        #region 公共属性
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
@@ -59,8 +59,7 @@
              : using a System.ComponentModel.TypeConverter
              : and then encoded with base64 encoding.
      -->
    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
                xmlns="">
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
        <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
        <xsd:element name="root" msdata:IsDataSet="true">
            <xsd:complexType>
@@ -68,11 +67,9 @@
                    <xsd:element name="metadata">
                        <xsd:complexType>
                            <xsd:sequence>
                                <xsd:element name="value" type="xsd:string"
                                             minOccurs="0"/>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
                            </xsd:sequence>
                            <xsd:attribute name="name" use="required"
                                           type="xsd:string"/>
              <xsd:attribute name="name" use="required" type="xsd:string" />
                            <xsd:attribute name="type" type="xsd:string"/>
                            <xsd:attribute name="mimetype" type="xsd:string"/>
                            <xsd:attribute ref="xml:space"/>
@@ -87,28 +84,21 @@
                    <xsd:element name="data">
                        <xsd:complexType>
                            <xsd:sequence>
                                <xsd:element name="value" type="xsd:string"
                                             minOccurs="0" msdata:Ordinal="1"/>
                                <xsd:element name="comment" type="xsd:string"
                                             minOccurs="0" msdata:Ordinal="2"/>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
                            </xsd:sequence>
                            <xsd:attribute name="name" type="xsd:string"
                                           use="required" msdata:Ordinal="1"/>
                            <xsd:attribute name="type" type="xsd:string"
                                           msdata:Ordinal="3"/>
                            <xsd:attribute name="mimetype" type="xsd:string"
                                           msdata:Ordinal="4"/>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
                            <xsd:attribute ref="xml:space"/>
                        </xsd:complexType>
                    </xsd:element>
                    <xsd:element name="resheader">
                        <xsd:complexType>
                            <xsd:sequence>
                                <xsd:element name="value" type="xsd:string"
                                             minOccurs="0" msdata:Ordinal="1"/>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                            </xsd:sequence>
                            <xsd:attribute name="name" type="xsd:string"
                                           use="required"/>
              <xsd:attribute name="name" type="xsd:string" use="required" />
                        </xsd:complexType>
                    </xsd:element>
                </xsd:choice>
@@ -122,24 +112,16 @@
        <value>2.0</value>
    </resheader>
    <resheader name="reader">
        <value>System.Resources.ResXResourceReader, System.Windows.Forms,
            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
        </value>
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    </resheader>
    <resheader name="writer">
        <value>System.Resources.ResXResourceWriter, System.Windows.Forms,
            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
        </value>
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    </resheader>
    <metadata name="barManager1.TrayLocation"
              type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
  <metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
        <value>17, 17</value>
    </metadata>
    <assembly alias="System.Drawing"
              name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
    <data name="btnEsc.ImageOptions.Image"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="btnEsc.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABZ0RVh0VGl0
            bGUAQmFja2dyb3VuZDtGaWxsO7QwF3QAAAMCSURBVDhPnZJrSJNRGMffLMOy1L6Yol2EbmShmQZJBSVh
@@ -158,9 +140,7 @@
            xn0JHn9Y9w+uhOV/Bf8HmN+Yo1PuV+DdyAAAAABJRU5ErkJggg==
        </value>
    </data>
    <data name="btnEsc.ImageOptions.LargeImage"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="btnEsc.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABZ0RVh0VGl0
            bGUAQmFja2dyb3VuZDtGaWxsO7QwF3QAAAmnSURBVFhHtZcJVNT1FscnK7N3XlmUmEuZSymLTzMtU59m
@@ -207,9 +187,7 @@
            f+6EnGfdugKwnQr2BIeDYf6s2JhN/P3hT7WuAGyDQf4foiES/RvDCa9FOGI5gAAAAABJRU5ErkJggg==
        </value>
    </data>
    <data name="btnPrint.ImageOptions.Image"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="btnPrint.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABx0RVh0VGl0
            bGUAUHJpbnRMYXlvdXRWaWV3O1ByaW50OyLF4Y0AAAM1SURBVDhPVZP9Txt1HMfvfzAx/uA/5K86dQ7r
@@ -229,9 +207,7 @@
            9AyOWcpXB3xcsY/c+xvJRDliKSBA7QAAAABJRU5ErkJggg==
        </value>
    </data>
    <data name="btnPrint.ImageOptions.LargeImage"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="btnPrint.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABx0RVh0VGl0
            bGUAUHJpbnRMYXlvdXRWaWV3O1ByaW50OyLF4Y0AAAjSSURBVFhHfZfpU5XnGcbP/9Cm0+l0JtPOZJrp
@@ -275,9 +251,7 @@
            7cZzfWJH2Xdv/w/5uw8JIJWYLQAAAABJRU5ErkJggg==
        </value>
    </data>
    <data name="btnHb.ImageOptions.Image"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="btnHb.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
            dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAE1vZGVsO0NvcHk7Q29weU1vZGVs
@@ -294,9 +268,7 @@
            zz8CKycyKpQrsLWW0D6V6jdzUIrq8TztCAAAAABJRU5ErkJggg==
        </value>
    </data>
    <data name="btnHb.ImageOptions.LargeImage"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="btnHb.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
            dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAE1vZGVsO0NvcHk7Q29weU1vZGVs
@@ -339,9 +311,7 @@
            RU5ErkJggg==
        </value>
    </data>
    <data name="btnKG.ImageOptions.Image"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="btnKG.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
            dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAARdEVYdFRpdGxlAERvd247QXJyb3c7vfyCWAAAAsBJ
@@ -360,9 +330,7 @@
            QmCC
        </value>
    </data>
    <data name="btnKG.ImageOptions.LargeImage"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="btnKG.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
            dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAARdEVYdFRpdGxlAERvd247QXJyb3c7vfyCWAAAB3xJ
@@ -401,9 +369,7 @@
            T5oqAAAAAElFTkSuQmCC
        </value>
    </data>
    <data name="btnIn.ImageOptions.Image"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="btnIn.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAA50RVh0VGl0
            bGUAWGxzO1NlbmRxQ3oaAAACiElEQVQ4T3WQ2U8TYRTFhxYKuP4hCBXhD/HBV5cXFawkqJgCXYSyRCWF
@@ -420,9 +386,7 @@
            xSRFBgDuD6syoJrXuXr4AAAAAElFTkSuQmCC
        </value>
    </data>
    <data name="btnIn.ImageOptions.LargeImage"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="btnIn.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAA50RVh0VGl0
            bGUAWGxzO1NlbmRxQ3oaAAAH5ElEQVRYR8VWaVDU5x3mBm2EmGum7ed+iYlGoYlJj+k1TjrtdNIvnXb6
@@ -462,9 +426,7 @@
            gCow0mM+bAAAAABJRU5ErkJggg==
        </value>
    </data>
    <data name="btnOut.ImageOptions.Image"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="btnOut.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAB10RVh0VGl0
            bGUARXhwb3J0O1hscztFeHBvcnRUb1hscztMoJn+AAACZklEQVQ4T2WTWWsTYRSGszdtg1r/Rk3Tmv4S
@@ -481,9 +443,7 @@
            SUVORK5CYII=
        </value>
    </data>
    <data name="btnOut.ImageOptions.LargeImage"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="btnOut.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAB10RVh0VGl0
            bGUARXhwb3J0O1hscztFeHBvcnRUb1hscztMoJn+AAAIXUlEQVRYR8WXeVSU1xnG2SGmSkia9Nictqfp
@@ -525,9 +485,7 @@
            5gfi7zm7378N/3+C2X8Bg3DBnOf3rOsAAAAASUVORK5CYII=
        </value>
    </data>
    <data name="btnReport.ImageOptions.Image"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="btnReport.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAABw1JREFUWEe1
            l/lXlFUYx7EyKy2X1r+lvdRj57TaZpYoELIMjIBiYJaIoKjsiwYIStHMgKCiLG5lqamQldluomlFDsuw
@@ -563,9 +521,7 @@
            UnOkUrvSAAAAAElFTkSuQmCC
        </value>
    </data>
    <data name="btnDesign.ImageOptions.Image"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="btnDesign.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAADZ0RVh0VGl0
            bGUAUGFnZSBTZXR1cDtTZXR1cDtDdXN0b21pejtEZXNpZ247U2V0dGluZztQcm9wZXJ07jthbQAAA0NJ
@@ -586,9 +542,7 @@
            5MMAAAAASUVORK5CYII=
        </value>
    </data>
    <data name="btnDesign.ImageOptions.LargeImage"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="btnDesign.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAADZ0RVh0VGl0
            bGUAUGFnZSBTZXR1cDtTZXR1cDtDdXN0b21pejtEZXNpZ247U2V0dGluZztQcm9wZXJ07jthbQAACGdJ