Ling0925
/
CeramicProject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1 from Ling0925/develop 

Merge develop
This commit is contained in:
Ling0925 2024-05-23 15:04:41 +08:00 committed by GitHub
parent ed8787f231 19b2931db4
commit 1db734bb52
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 167 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
newyt/Module_data/Picking_list.aspx.cs
View File

@ -220,7 +220,8 @@ public partial class Picking_list : System.Web.UI.Page
{ {
cmd = string.Format("select CONVERT(varchar(12),ckrq,111) as 'riqi' from view_nr_z_scdck where ckrq>='{0}' and ckrq<='{1}' ", yuechu, yuemo); cmd = string.Format("select CONVERT(varchar(12),ckrq,111) as 'riqi' from view_nr_z_scdck where ckrq>='{0}' and ckrq<='{1}' ", yuechu, yuemo);
} }
else { else
{
cmd = string.Format("select CONVERT(varchar(12),ckrq,111) as 'riqi' from view_nr_z_scdck where ckrq>='{0}' and ckrq<='{1}' and ckzt='{2}'", yuechu, yuemo, zt); cmd = string.Format("select CONVERT(varchar(12),ckrq,111) as 'riqi' from view_nr_z_scdck where ckrq>='{0}' and ckrq<='{1}' and ckzt='{2}'", yuechu, yuemo, zt);
} }
@ -332,7 +333,8 @@ public partial class Picking_list : System.Web.UI.Page
{ {
selectcode = "select " + colmn + " from view_nr_z_scdck where 1=1 and ckzt='" + drp_zt.Value + "'"; selectcode = "select " + colmn + " from view_nr_z_scdck where 1=1 and ckzt='" + drp_zt.Value + "'";
} }
else { else
{
selectcode = "select " + colmn + " from view_nr_z_scdck where 1=1 "; selectcode = "select " + colmn + " from view_nr_z_scdck where 1=1 ";
} }
if (tj != "") if (tj != "")

3
newyt/Module_data/Sample_browse.aspx.cs
View File

@ -114,7 +114,8 @@ public partial class Sample_browse : System.Web.UI.Page
{ {
bt_hdsh.Visible = true; bt_hdsh.Visible = true;
} if (DBHlper.GetPermission(juese, "样品登记", "nr_z_ypdj", "生成产品")) }
if (DBHlper.GetPermission(juese, "样品登记", "nr_z_ypdj", "生成产品"))
{ {
bt_sccpda.Visible = true; bt_sccpda.Visible = true;
} }

2
newyt/Module_data/WorkRecord_browse.aspx
View File

@ -254,7 +254,7 @@
</div> </div>
<input id="btn_khclose" style="display:none" type=button onclick="$('#dialog-djjv').dialog('close');"/> <input id="btn_khclose" style="display:none" type=button onclick="$('#dialog-djjv').dialog('close');"/>
<span style=" display:none"><asp:button id="sctqkc" runat="server" CssClass="button bluez small" Visible=false OnClientClick="return qrtqcz()" onclick="sctqkc_Click" ></asp:button></span> <span style=" display:none"><asp:button id="sctqkc" runat="server" CssClass="button bluez small" Visible=false OnClientClick="return qrtqcz()" onclick="sctqkc_Click" ></asp:button></span>
<span style=" display:none"> <asp:button id="scdjbt" runat="server" CssClass="button" Width="100" Visible=false OnClientClick="return qrdjft()" onclick="scdjbt_Click" ></asp:button> </span> <span > <asp:button id="scdjbt" runat="server" CssClass="button" Width="100" Visible=true OnClientClick="return qrdjft()" onclick="scdjbt_Click" ></asp:button> </span>
<span style=" display:none"><asp:button id="scxfbt" runat="server" CssClass="button bluez small" Visible=false OnClientClick="return qrxfbt()" onclick="scxfbt_Click" ></asp:button></span> <span style=" display:none"><asp:button id="scxfbt" runat="server" CssClass="button bluez small" Visible=false OnClientClick="return qrxfbt()" onclick="scxfbt_Click" ></asp:button></span>
<asp:HiddenField ID="scdjhd" runat="server" Value="" /> <asp:HiddenField ID="scdjhd" runat="server" Value="" />
<asp:HiddenField ID="qxhjzhd" runat="server" Value="" /> <asp:HiddenField ID="qxhjzhd" runat="server" Value="" />