From c052583025ff87735d2120dc63aeee7ea5e5524e Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期三, 23 十一月 2022 09:25:11 +0800
Subject: [PATCH] 多项优化
---
web/web/Bin/Dao.dll | 0
web/Dao/GwOrderDao.cs | 7 +--
web/web/GwSp.aspx | 19 +++++----
web/.vs/Web/FileContentIndex/54d13018-9b98-4cb8-82e4-60d957fd21bd.vsidx | 0
web/.vs/Web/FileContentIndex/1bc43914-da5e-4a96-8aec-a027603c8eb5.vsidx | 0
web/.vs/Web/FileContentIndex/read.lock | 0
web/web/GwSp.ashx | 16 ++++----
web/Lib/Dao.dll | 0
web/web/Main.master | 4 +-
web/Dao/GwSpDao.cs | 14 +++---
web/web/Bin/UMCLib.dll | 0
web/.vs/Web/v16/.suo | 0
web/web/GwOrder.ashx | 12 ++++-
web/web/GwClient.aspx | 13 ++++--
web/web/GwOrderCreate.aspx | 6 ++
web/.vs/Web/FileContentIndex/54ad995a-69de-48b5-8633-7a86a3b5b0e5.vsidx | 0
web/web/GwOrderList.aspx | 17 +++++---
web/Lib/Dao.pdb | 0
web/web/Bin/Dao.pdb | 0
19 files changed, 63 insertions(+), 45 deletions(-)
diff --git a/web/.vs/Web/FileContentIndex/1bc43914-da5e-4a96-8aec-a027603c8eb5.vsidx b/web/.vs/Web/FileContentIndex/1bc43914-da5e-4a96-8aec-a027603c8eb5.vsidx
new file mode 100644
index 0000000..e4e6ec9
--- /dev/null
+++ b/web/.vs/Web/FileContentIndex/1bc43914-da5e-4a96-8aec-a027603c8eb5.vsidx
Binary files differ
diff --git a/web/.vs/Web/FileContentIndex/54ad995a-69de-48b5-8633-7a86a3b5b0e5.vsidx b/web/.vs/Web/FileContentIndex/54ad995a-69de-48b5-8633-7a86a3b5b0e5.vsidx
new file mode 100644
index 0000000..0df3968
--- /dev/null
+++ b/web/.vs/Web/FileContentIndex/54ad995a-69de-48b5-8633-7a86a3b5b0e5.vsidx
Binary files differ
diff --git a/web/.vs/Web/FileContentIndex/54d13018-9b98-4cb8-82e4-60d957fd21bd.vsidx b/web/.vs/Web/FileContentIndex/54d13018-9b98-4cb8-82e4-60d957fd21bd.vsidx
new file mode 100644
index 0000000..4510951
--- /dev/null
+++ b/web/.vs/Web/FileContentIndex/54d13018-9b98-4cb8-82e4-60d957fd21bd.vsidx
Binary files differ
diff --git a/web/.vs/Web/FileContentIndex/read.lock b/web/.vs/Web/FileContentIndex/read.lock
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/web/.vs/Web/FileContentIndex/read.lock
diff --git a/web/.vs/Web/v16/.suo b/web/.vs/Web/v16/.suo
index 2ee2679..fe01d70 100644
--- a/web/.vs/Web/v16/.suo
+++ b/web/.vs/Web/v16/.suo
Binary files differ
diff --git a/web/Dao/GwOrderDao.cs b/web/Dao/GwOrderDao.cs
index 1b177c9..0614adc 100644
--- a/web/Dao/GwOrderDao.cs
+++ b/web/Dao/GwOrderDao.cs
@@ -229,13 +229,12 @@
if (string.IsNullOrEmpty(orderId))
return false;
//status:4-鍙栨秷
- return OracleHelper.ExecuteSql("update GW_ORDER SET BASIC_NUM=:BASIC_NUM, GIVING_NUM=:GIVING_NUM, ORDER_NUM_TOTAL=:ORDER_NUM_TOTAL, ORDER_AMOUNT_TOTAL=:ORDER_AMOUNT_TOTAL, PAY_AMOUNT=:PAY_AMOUNT, BEFORE_BALANCE_NUM=:BEFORE_BALANCE_NUM, STATUS = :STATUS where ORDER_ID=:ORDER_ID", OracleHelper.Connection
+ return OracleHelper.ExecuteSql("update GW_ORDER SET BASIC_NUM=:BASIC_NUM, GIVING_NUM=:GIVING_NUM, ORDER_NUM_TOTAL=:ORDER_NUM_TOTAL, ORDER_AMOUNT_TOTAL=:ORDER_AMOUNT_TOTAL, PAY_AMOUNT=:PAY_AMOUNT, STATUS = :STATUS where ORDER_ID=:ORDER_ID", OracleHelper.Connection
, new OracleParameter(":BASIC_NUM", (object)basicNum)
, new OracleParameter(":GIVING_NUM", (object)givingNum)
, new OracleParameter(":ORDER_NUM_TOTAL", (object)orderNumTotal)
, new OracleParameter(":ORDER_AMOUNT_TOTAL", (object)orderAmountTotal)
, new OracleParameter(":PAY_AMOUNT", (object)payAmount)
- , new OracleParameter(":BEFORE_BALANCE_NUM", (object)beforeGivingNum)
, new OracleParameter(":STATUS", (object)orderStatus)
, new OracleParameter(":ORDER_ID", (object)orderId)
) > 0;
@@ -308,7 +307,7 @@
builder.Append(" LEFT JOIN ( ");
builder.Append(" SELECT order_id, max(audit_time) update_time FROM gw_order_audit goa ");
builder.Append(" GROUP BY order_id ");
- builder.Append(" ) b ON b.order_id = a.order_id ");
+ builder.Append($" ) b ON b.order_id = a.order_id where update_time>=TO_date('{DateTime.Now.Date}','yyyy-MM-dd HH24:mi:ss') ");
builder.Append(" ) ");
builder.Append(" WHERE 1=1 AND status=2 ");
//builder.Append(" AND update_time=:UPDATE_TIME ");
@@ -380,7 +379,7 @@
o.OrderId = oracleReaderWrapper.GetString("ORDER_ID", "");
o.SpId = oracleReaderWrapper.GetString("SP_ID", "");
o.ClientId = oracleReaderWrapper.GetString("CLIENT_ID", "");
- o.Company = oracleReaderWrapper.GetString("Client_Name", "");
+ o.Company = oracleReaderWrapper.GetString("COMPANY", "");
o.ClientName = oracleReaderWrapper.GetString("CLIENT_NAME", "");
o.ProductId = oracleReaderWrapper.GetString("PRODUCT_ID", "");
o.ProductName = oracleReaderWrapper.GetString("PRODUCT_NAME", "");
diff --git a/web/Dao/GwSpDao.cs b/web/Dao/GwSpDao.cs
index 3c3843a..afb0514 100644
--- a/web/Dao/GwSpDao.cs
+++ b/web/Dao/GwSpDao.cs
@@ -249,7 +249,7 @@
return list1;
}
- public List<GwSp> LoadInfoList(string spId, string apId, string clientId, string clientName, int routerType, string opID, int chargeType, int pageIndex, int pageSize
+ public List<GwSp> LoadInfoList(string spId, string apId, string clientId, string company, int routerType, string opId, int chargeType, int pageIndex, int pageSize
, string resendStatus, string productId, string permissionsSQL, out int recordCount)
{
List<GwSp> list1 = new List<GwSp>();
@@ -288,9 +288,9 @@
list2.Add(new OracleParameter(":ClientID", (object)('%' + clientId + '%')));
stringBuilder.Append(" and CLIENT_ID like :ClientID");
}
- if (clientName != null && clientName != "")
+ if (company != null && company != "")
{
- stringBuilder.Append(" and CLIENT_ID IN (SELECT CLIENT_ID FROM GW_CLIENT WHERE CLIENT_NAME like '%" + clientName + "%' )");
+ stringBuilder.Append(" and CLIENT_ID IN (SELECT CLIENT_ID FROM GW_CLIENT WHERE COMPANY like '%" + company + "%' )");
}
/**
if (chargeType > 0)
@@ -309,20 +309,20 @@
{
list2.Add(new OracleParameter(":ROUTER_TYPE", (object)routerType));
stringBuilder.Append(" and ROUTER_TYPE=:ROUTER_TYPE");
- if (!string.IsNullOrEmpty(opID))
+ if (!string.IsNullOrEmpty(opId))
{
stringBuilder.Append(" and (CM_OP_ID=:OPID) OR (CT_OP_ID=:OPID) OR (UN_OP_ID=:OPID) ");
- list2.Add(new OracleParameter(":OPID", (object)opID));
+ list2.Add(new OracleParameter(":OPID", (object)opId));
}
}
if (routerType == 3)
{
list2.Add(new OracleParameter(":ROUTER_TYPE", (object)routerType));
stringBuilder.Append(" and ROUTER_TYPE=:ROUTER_TYPE");
- if (!string.IsNullOrEmpty(opID))
+ if (!string.IsNullOrEmpty(opId))
{
stringBuilder.Append(" and (CM_GROUP_ID=:OPID) OR (CU_GROUP_ID=:OPID) OR (CT_GROUP_ID=:OPID) ");
- list2.Add(new OracleParameter(":OPID", (object)opID));
+ list2.Add(new OracleParameter(":OPID", (object)opId));
}
}
}
diff --git a/web/Lib/Dao.dll b/web/Lib/Dao.dll
index e06ece8..369fbfa 100644
--- a/web/Lib/Dao.dll
+++ b/web/Lib/Dao.dll
Binary files differ
diff --git a/web/Lib/Dao.pdb b/web/Lib/Dao.pdb
index aec911e..68bb029 100644
--- a/web/Lib/Dao.pdb
+++ b/web/Lib/Dao.pdb
Binary files differ
diff --git a/web/web/Bin/Dao.dll b/web/web/Bin/Dao.dll
index e06ece8..369fbfa 100644
--- a/web/web/Bin/Dao.dll
+++ b/web/web/Bin/Dao.dll
Binary files differ
diff --git a/web/web/Bin/Dao.pdb b/web/web/Bin/Dao.pdb
index aec911e..68bb029 100644
--- a/web/web/Bin/Dao.pdb
+++ b/web/web/Bin/Dao.pdb
Binary files differ
diff --git a/web/web/Bin/UMCLib.dll b/web/web/Bin/UMCLib.dll
index 7b4e055..de922c5 100644
--- a/web/web/Bin/UMCLib.dll
+++ b/web/web/Bin/UMCLib.dll
Binary files differ
diff --git a/web/web/GwClient.aspx b/web/web/GwClient.aspx
index 277511f..e2fac9d 100644
--- a/web/web/GwClient.aspx
+++ b/web/web/GwClient.aspx
@@ -1,11 +1,17 @@
锘�<%@ Page Language="C#" MasterPageFile="~/Main.master" AutoEventWireup="true" CodeFile="GwClient.aspx.cs" Inherits="_GwClient" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="Server">
+ <script type="text/javascript" src="/web/js/jquery.min.js?v=2.1.4"></script>
<%--<link href="css/plugins/bootstrap-fileinput/fileinput.min.css" rel="stylesheet"/>
<script src="js/plugins/bootstrap-fileinput/fileinput.min.js" type="text/javascript"></script>--%>
<script type="text/javascript">
$(document).ready(function () {
$("textarea").numberedtextarea();
+
+ //鍏ㄩ��
+ $("#checkAll").click(function () {
+ $("input[name='checkbox']").prop("checked", $(this).is(":checked"));
+ });
$(document).on("click", ".action-query", function () {
loadPageList();
@@ -369,10 +375,9 @@
return pwd;
}
- //鍏ㄩ��
- $("#checkAll").click(function () {
- $("input[name='checkbox']").prop("checked", $(this).is(":checked"));
- });
+
+
+
//鎵归噺鍒嗛厤涓�т骇鍝�:鎵撳紑鐣岄潰
$(document).on("click", ".action-modal-setProduct", function () {
diff --git a/web/web/GwOrder.ashx b/web/web/GwOrder.ashx
index 2289a51..e774479 100644
--- a/web/web/GwOrder.ashx
+++ b/web/web/GwOrder.ashx
@@ -173,8 +173,8 @@
//str1 = str1 + "<td>" + bean.Remark + "</td>";
str1 += "<td class=\"text-right\">";
- str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" class=\"action-modal-detail btn btn-success btn-xs\"><i class=\"fa fa-search\"></i> 鏌ョ湅</a> ", (object) bean.OrderId);
- str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" class=\"action-modal-audit btn btn-success btn-xs\"><i class=\"fa fa-search\"></i> 瀹℃牳</a> ", (object) bean.OrderId);
+ str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" class=\"action-modal-detail btn btn-info btn-xs\"><i class=\"fa fa-search\"></i> 鏌ョ湅</a> ", (object) bean.OrderId);
+ str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" style=\"margin-top:10px; \" class=\"action-modal-audit btn btn-success btn-xs\"><i class=\"fa fa-edit\"></i> 瀹℃牳</a> ", (object) bean.OrderId);
if(bean.Status == 0) {
str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" class=\"action-modal-cancel btn btn-success btn-xs\"><i class=\"fa fa-search\"></i> 鍙栨秷</a> ", (object) bean.OrderId);
}
@@ -237,7 +237,7 @@
str1 += "<tr><td>" + bean.OrderId + "</td>";
str1 = str1 + "<td>" + bean.SpId + "</td>";
str1 = str1 + "<td>" + bean.ClientId + "</td>";
- //str1 = str1 + "<td>" + bean.Company + "</td>";
+ str1 = str1 + "<td>" + bean.Company + "</td>";
str1 = str1 + "<td>" + ProductToName(bean.ProductId) + "</td>";
//str1 = str1 + "<td>" + bean.ComboId + "</td>";
str1 = str1 + "<td>" + bean.BasicNum + "</td>";
@@ -671,6 +671,12 @@
productId = gwSp.ProductId;
price = gwSp.Price;
+
+ if (string.IsNullOrEmpty(gwSp.ProductId))
+ {
+ throw new ArgumentException("浜у搧閰嶇疆涓嶅厑璁镐负绌猴紒璇峰厛閰嶇疆璐﹀彿鎵�鍏宠仈浜у搧锛�");
+ }
+
orderNumTotal = basicNum + givingNum;
orderAmountTotal = basicNum * price;
diff --git a/web/web/GwOrderCreate.aspx b/web/web/GwOrderCreate.aspx
index 542861c..f352f0f 100644
--- a/web/web/GwOrderCreate.aspx
+++ b/web/web/GwOrderCreate.aspx
@@ -178,11 +178,15 @@
var givingNum = $("#givingNum").val();
var remark = $("#remark").val();
+ let _basicNum = $("#_basicNum").val();
+ let _givingNum = $("#_givingNum").val();
+ let beforeBalanceNum = parseInt(_basicNum) + parseInt(_givingNum);
+
mytek.confirm("鏄惁纭畾鍏呭�硷紵", "鏄惁鎿嶄綔锛�", function (b) {
if (b) {
- $.post("gwOrder.ashx", { action: "add", spId: spId, clientId: clientId, productId: productId, price: price, payAmount:payAmount, basicNum: basicNum, givingNum: givingNum, remark: remark }, function (r) {
+ $.post("gwOrder.ashx", { action: "add", spId: spId, clientId: clientId, productId: productId, price: price, payAmount: payAmount, basicNum: basicNum, givingNum: givingNum, remark: remark, beforeBalanceNum: beforeBalanceNum }, function (r) {
mytek.alert(r.Message, r.OK, function () {
if (r.OK) {
diff --git a/web/web/GwOrderList.aspx b/web/web/GwOrderList.aspx
index 1fda705..08155ad 100644
--- a/web/web/GwOrderList.aspx
+++ b/web/web/GwOrderList.aspx
@@ -129,17 +129,19 @@
class="form-inline">
<div class="ibox">
<div class="input-group m-b">
- <span class="input-group-addon">瀹㈡埛璐﹀彿</span>
+ <span class="input-group-addon">鐭俊璐﹀彿</span>
+ <input type="text" name="SpID" id="SpID" value="<%=SpID %>" class="form-control" />
+ </div>
+
+ <div class="input-group m-b">
+ <span class="input-group-addon">瀹㈡埛璐︽埛</span>
<input type="text" name="ClientID" id="ClientID" value="<%=ClientId %>" class="form-control" />
</div>
<div class="input-group m-b">
<span class="input-group-addon">鍏徃鍚嶇О</span>
<input type="text" name="Company" id="Company" class="form-control " />
</div>
- <div class="input-group m-b">
- <span class="input-group-addon">鐭俊璐﹀彿</span>
- <input type="text" name="SpID" id="SpID" value="<%=SpID %>" class="form-control" />
- </div>
+
<div class="input-group m-b">
<div class="input-daterange input-group " id="datepicker">
<span class="input-group-addon">鏃堕棿鑼冨洿 <i class="fa fa-calendar"></i></span>
@@ -165,8 +167,9 @@
</th>
<th>鐭俊璐﹀彿
</th>
- <th>瀹㈡埛璐﹀彿
+ <th>瀹㈡埛璐︽埛
</th>
+ <th>鍏徃鍚嶇О</th>
<th>浜у搧鍚嶇О
</th>
<%--<th>濂楅ID
@@ -240,7 +243,7 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
- 瀹㈡埛璐﹀彿</label>
+ 瀹㈡埛璐︽埛</label>
<div class="col-sm-4 ">
<!--
<select name="clientId" id="clientId" class="form-control">
diff --git a/web/web/GwSp.ashx b/web/web/GwSp.ashx
index feafff4..78adb08 100644
--- a/web/web/GwSp.ashx
+++ b/web/web/GwSp.ashx
@@ -307,17 +307,17 @@
string string1 = context.GetString("apID");
string clientId = context.GetString("clientID");
string string2 = context.GetString("spID");
- string string3 = context.GetString("opID");
+ string opId = context.GetString("opID");
int int1 = context.GetInt("routerType");
- string string4 = context.GetString("clientName");
+ string company = context.GetString("company");
int int2 = context.GetInt("chargeType");
int recordCount = 0;
int int3 = context.GetInt("pageSize", 20);
int int4 = context.GetInt("pageIndex", 1);
int int5 = context.GetInt("resendStatus", 1);
string productId = context.GetString("productId")==null? "": context.GetString("productId");
- if (!string.IsNullOrEmpty(string3) && int1 <= 0)
- throw new ArgumentException("璇烽�夋嫨閫氶亾缁勮矾鐢辨ā寮�");
+ if (!string.IsNullOrEmpty(opId) && int1 <= 0)
+ { throw new ArgumentException("璇烽�夋嫨閫氶亾缁勮矾鐢辨ā寮�"); }
GwSpDao gwSpDao = new GwSpDao();
string apId = "0";
if (this.IsInt(string1))
@@ -328,7 +328,7 @@
string permissionsSQL = new GwClientDao().GetClientPermissions(_userId, _userType, null);
//鍔犺浇璐﹀彿鍒楄〃淇℃伅
- List<GwSp> list = gwSpDao.LoadInfoList(string2, apId, clientId, string4, int1, string3, int2, int4, int3, int5.ToString(), productId, permissionsSQL, out recordCount);
+ List<GwSp> list = gwSpDao.LoadInfoList(string2, apId, clientId, company, int1, opId, int2, int4, int3, int5.ToString(), productId, permissionsSQL, out recordCount);
string str1 = "";
if (list != null && list.Count > 0)
{
@@ -690,8 +690,8 @@
cTPattern.Enabled = context.GetInt("enabled");
cTPattern.Pattern = context.GetString("patternContent");
string pattern = @"^[A-Za-z0-9]+$"; //鍒ゆ柇鏄瓧绗︽垨鏁板瓧
- //if (!Regex.IsMatch(o.SpID, "^\\d{6}$"))
- // throw new Exception("璐﹀彿蹇呴』涓�6浣嶆暟瀛楋紒");
+ //if (!Regex.IsMatch(o.SpID, "^\\d{6}$"))
+ // throw new Exception("璐﹀彿蹇呴』涓�6浣嶆暟瀛楋紒");
if (!Regex.IsMatch(o.SpID, "^[A-Za-z0-9]{6}$"))
throw new Exception("璐﹀彿蹇呴』涓�6浣嶅瓧绗︽垨鏁板瓧锛�");
if (o.AccessCodeMode == 1)
@@ -839,7 +839,7 @@
this._Dao.Add(o);
this._Dao.UpdatePattern(string1, @int, string2, context.OperatorID);//娣诲姞璐﹀彿鐨勬椂鍊欓厤缃姤澶�
-
+
//濡傛灉閫夋嫨浜嗕骇鍝侊紝琛ㄧず鍒涘缓鐨勬椂鍊欏氨婵�娲汇�傚悗鍙板垱寤烘棤璧犻��
if (!string.IsNullOrEmpty(o.ProductId))
{
diff --git a/web/web/GwSp.aspx b/web/web/GwSp.aspx
index 3b69964..6edcac4 100644
--- a/web/web/GwSp.aspx
+++ b/web/web/GwSp.aspx
@@ -2,7 +2,7 @@
<asp:Content runat="server" ID="Content1" ContentPlaceHolderID="head">
<link href="../static/select2/select2.css" type="text/css" rel="stylesheet" />
<script src="../static/select2/select2.js" language="javascript" type="text/javascript"></script>
-
+ <script type="text/javascript" src="/web/js/jquery.min.js?v=2.1.4"></script>
<script type="text/javascript" language="javascript">
$(document).ready(function() {
@@ -17,14 +17,14 @@
var clientID = $("#clientID").val();
var opID = $("#opID").val();
var routerType = $("#routerType").val();
- var clientName = $("#clientName").val();
+ var company = $("#company").val();
var chargeType = $("#chargeType").val();
var resendStatus = $("#RESEND_STATUS").val();
var productId = $("#productId").val();
$.ajax({
url: "GwSp.ashx",
type: "POST",
- data: { action: "loadGwSpAccountPageList", spID: spID, apID: apID, opID: opID, routerType: routerType, clientID: clientID, clientName: clientName, chargeType: chargeType, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize(), resendStatus: resendStatus, productId: productId },
+ data: { action: "loadGwSpAccountPageList", spID: spID, apID: apID, opID: opID, routerType: routerType, clientID: clientID, company: company, chargeType: chargeType, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize(), resendStatus: resendStatus, productId: productId },
success: function(result) {
if (result.OK) {
$("#gwspTable tbody").html(result.Message.Table);
@@ -89,7 +89,8 @@
method: "POST",
data: { idArray: $.toJSON(idArray), cmopID: cmopID, ctopID: ctopID, unopID: unopID, cmGroupID: cmGroupID, cuGroupID: cuGroupID, ctGroupID: ctGroupID, action: "batchUpdateOp" },
success: function(result) {
- mytek.alert(result.Message, result.OK, function() {
+ mytek.alert(result.Message, result.OK, function () {
+ $("#opDialog").modal("hide");
loadPageList();
});
}
@@ -403,20 +404,20 @@
-->
<div class="form-group">
<div class="input-group m-b">
- <span class="input-group-addon">瀹㈡埛璐﹀彿</span>
+ <span class="input-group-addon">瀹㈡埛璐︽埛</span>
<input type="text" name="clientID" id="clientID" class="form-control col-md-2" />
</div>
</div>
<div class="form-group">
<div class="input-group m-b">
- <span class="input-group-addon">瀹㈡埛鍚嶇О</span>
- <input type="text" name="clientName" id="clientName" class="form-control col-md-2" />
+ <span class="input-group-addon">鍏徃鍚嶇О</span>
+ <input type="text" name="company" id="company" class="form-control col-md-2" />
</div>
</div>
<div class="form-group">
<div class="input-group m-b">
- <span class="input-group-addon">閫氶亾鍚�</span>
+ <span class="input-group-addon">閫氶亾ID</span>
<input type="text" name="opID" id="opID" class="form-control col-md-2" />
</div>
</div>
@@ -461,7 +462,7 @@
<div class="form-group">
<div class="input-group m-b">
<select name="RESEND_STATUS" class="form-control" id="RESEND_STATUS">
- <option value="3">鑷姩琛ュ彂</option>
+ <option value="3">--琛ュ彂璁剧疆--</option>
<option value="1">鍚敤琛ュ彂</option>
<option value="0">鍋滅敤琛ュ彂</option>
</select>
diff --git a/web/web/Main.master b/web/web/Main.master
index 6289e78..e1e2dde 100644
--- a/web/web/Main.master
+++ b/web/web/Main.master
@@ -26,9 +26,9 @@
<script src="js/jquery.min.js?v=2.1.4"></script>
-<!--璋冭瘯鍚敤锛屾寮忎娇鐢ㄧ鐢�
+<!--璋冭瘯鍚敤锛屾寮忎娇鐢ㄧ鐢�-->
<script type="text/javascript" src="/web/js/jquery.min.js?v=2.1.4"></script>
- -->
+
<!-- 澧炲姞浜唗ype="text/javascript"-->
--
Gitblit v1.9.1