浏览代码

修改,报告界面中导出国标按钮,的显示问题,清洁度模式下,不显示导出国标按钮

zhangjiaxin 11 月之前
父节点
当前提交
61f096d5ed

+ 13 - 5
Bin/x64/Debug/Config/ReportTemplate/Inca_Template/ReportTemplateConfig.xml

@@ -1,10 +1,9 @@
 <XmlConfig>
   <M_SY>
-    <str_tb_ZBT>Cleanness Re</str_tb_ZBT>
-    <str_tb_FBT>有限公司</str_tb_FBT>
+    <str_tb_ZBT>夹杂物报告</str_tb_ZBT>
+    <str_tb_FBT>xxx有限公司</str_tb_FBT>
     <str_tb_YPBH>0001</str_tb_YPBH>
-    <str_tb_CKBZ>
-    </str_tb_CKBZ>
+    <str_tb_CKBZ>GB30834</str_tb_CKBZ>
     <b_ck_ypsm>True</b_ck_ypsm>
     <b_ck_jggk>True</b_ck_jggk>
     <str_bz>
@@ -12,6 +11,7 @@
     <str_xzkl>全部颗粒</str_xzkl>
     <int_xzkl>0</int_xzkl>
     <LOGName>ReportIdentification.bmp</LOGName>
+    <StandardLibraryName>NoSTDDB.db</StandardLibraryName>
   </M_SY>
   <M_YMYJ>
     <str_tb_ymwb>锂电异物分析报告</str_tb_ymwb>
@@ -22,7 +22,7 @@
   <M_KLFXJG>
     <b_ck_klcc_xsmk>True</b_ck_klcc_xsmk>
     <index_cb_klcc_jsfs>3</index_cb_klcc_jsfs>
-    <index_cb_klcc_ljb>1</index_cb_klcc_ljb>
+    <index_cb_klcc_ljb>2</index_cb_klcc_ljb>
     <index_cb_klcc_klfw>0</index_cb_klcc_klfw>
     <b_cb_jzwfl_xsmk>True</b_cb_jzwfl_xsmk>
     <index_cb_jzwfl_xstx>0</index_cb_jzwfl_xstx>
@@ -72,10 +72,18 @@
     <list_lbv_syxt_mblb>
       <MB0>MgO.CaO.Al₂O₃</MB0>
       <MB1>CaO.SiO₂.Al₂O₃</MB1>
+      <MB2>MnO.S.Al₂O₃</MB2>
+      <MB3>CaO.TiN.Al₂O₃</MB3>
+      <MB4>CaO.CaS.Al₂O₃</MB4>
+      <MB5>MnS.CaS.Al₂O₃</MB5>
     </list_lbv_syxt_mblb>
     <list_lbv_syxt_mblb_index>
       <MBIndex0>0</MBIndex0>
       <MBIndex1>2</MBIndex1>
+      <MBIndex2>3</MBIndex2>
+      <MBIndex3>4</MBIndex3>
+      <MBIndex4>6</MBIndex4>
+      <MBIndex5>7</MBIndex5>
     </list_lbv_syxt_mblb_index>
     <str_cb_syxt_ljb>lj.psf</str_cb_syxt_ljb>
   </M_SYXT>

+ 3 - 3
OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Export.Designer.cs

@@ -201,7 +201,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(473, 345);
+            this.ClientSize = new System.Drawing.Size(473, 347);
             this.ControlBox = false;
             this.Controls.Add(this.button7);
             this.Controls.Add(this.cbo_sjy);
@@ -221,9 +221,9 @@
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Margin = new System.Windows.Forms.Padding(2);
             this.MaximizeBox = false;
-            this.MaximumSize = new System.Drawing.Size(489, 384);
+            this.MaximumSize = new System.Drawing.Size(489, 386);
             this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(489, 384);
+            this.MinimumSize = new System.Drawing.Size(489, 386);
             this.Name = "OTSReport_Export";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "报告程序输出界面";

+ 4 - 0
OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Export.cs

@@ -601,6 +601,10 @@ namespace OTSIncAReportApp
             LoadControlsToXml();
             tb_mblj.Text = fileName;
             ReadClassification();
+            if (m_ReportApp.m_RptConfigFile.Systype == OTS_SysType_ID.CleannessA)
+            {
+                button7.Visible = false;
+            }
         }
         #endregion
         #region 自定义方法