diff --git a/web/App_Code/Model/Model.Designer.cs b/web/App_Code/Model/Model.Designer.cs index 5fe94e7..dc691dc 100644 --- a/web/App_Code/Model/Model.Designer.cs +++ b/web/App_Code/Model/Model.Designer.cs @@ -1,4 +1,4 @@ -// 已啟用模型 'D:\project\17168ERP\web\App_Code\Model\Model.edmx' 的 T4 程式碼產生。 +// 已啟用模型 'D:\17168ERP\web\App_Code\Model\Model.edmx' 的 T4 程式碼產生。 // 若要啟用舊版程式碼產生,請將 [程式碼產生策略] 設計工具屬性的值 //變更為 [舊版 ObjectContext]。當模型在設計工具中開啟時,這個屬性便可 //以在 [屬性] 視窗中使用。 diff --git a/web/App_Code/api/transfer_registerController.cs b/web/App_Code/api/transfer_registerController.cs index 269f887..5b0d40e 100644 --- a/web/App_Code/api/transfer_registerController.cs +++ b/web/App_Code/api/transfer_registerController.cs @@ -1280,4 +1280,23 @@ public class transfer_registerController : ApiController } } } -} \ No newline at end of file +} + + + + +//select ord.order_no, ord.activity_num, ord.f_num, ord.u_name, ord.totals as cost, isnull(reg.totals, 0) totals +//from ( +//select o.order_no, o.activity_num, o.f_num, o.u_name, sum(o.totals) as totals from ( +//select a.order_no, a.f_num, d.u_name, a.activity_num, b.num, b.f_num_tablet, +//b.price, b.qty, totals = b.price * b.qty, c.kind, c.subject +//from pro_order a +//left join pro_order_detail b on a.order_no=b.order_no +//left join actItem c on b.actItem_num=c.num +//left join followers d on a.f_num=d.num )o +//group by o.order_no, o.activity_num, o.f_num, o.u_name) ord +//left join ( +//select a.activity_num, a.f_num, sum(a.amount) totals from transfer_register a +//where status='2' and check_status='99' +//group by a.activity_num, a.f_num +//) reg on ord.activity_num=reg.activity_num and ord.f_num=reg.f_num \ No newline at end of file diff --git a/web/admin/bill/balance_reconcile.vue b/web/admin/bill/balance_reconcile.vue new file mode 100644 index 0000000..60273cd --- /dev/null +++ b/web/admin/bill/balance_reconcile.vue @@ -0,0 +1,868 @@ + + + + \ No newline at end of file diff --git a/web/admin/bill/balance_reconcile_query.vue b/web/admin/bill/balance_reconcile_query.vue new file mode 100644 index 0000000..cb786ad --- /dev/null +++ b/web/admin/bill/balance_reconcile_query.vue @@ -0,0 +1,300 @@ + + + + + \ No newline at end of file diff --git a/web/admin/bill/group_reconcile.vue b/web/admin/bill/group_reconcile.vue new file mode 100644 index 0000000..df494c9 --- /dev/null +++ b/web/admin/bill/group_reconcile.vue @@ -0,0 +1,657 @@ + + \ No newline at end of file diff --git a/web/admin/bill/index.aspx b/web/admin/bill/index.aspx index aaaf4d5..8bb54b6 100644 --- a/web/admin/bill/index.aspx +++ b/web/admin/bill/index.aspx @@ -1,7 +1,6 @@ -<%@ Page Title="匯款/沖帳管" Language="C#" MasterPageFile="~/admin/Templates/TBS5ADM001/MasterPage.master" AutoEventWireup="true" CodeFile="index.aspx.cs" Inherits="admin_bill_index" %> - - - +<%@ Page Title="匯款/沖帳管理" Language="C#" MasterPageFile="~/admin/Templates/TBS5ADM001/MasterPage.master" AutoEventWireup="true" EnableEventValidation="false" CodeFile="index.aspx.cs" Inherits="admin_bill_index" %> + + + - -

匯款/沖帳管理

+ +

匯款/沖帳管理

- -
-
- -
-
- 匯款登錄與核對 -
-
- -
-
- -
+ + +
+
+ +
+
+ 匯款登錄與核對 +
+
- - -
-
- - - - -
- - - - - -
-
- 查詢功能 -
-
- -
-
- -
-
沖帳查詢
- 查詢所有沖帳記錄與明細 -
-
- 會計 -
-
- -
-
- -
-
餘額核銷查詢
- 查詢已完成的餘額核銷記錄 -
-
- 會計 -
-
+ +
+
+
+
+ 系統說明 +
+
    +
  • 匯款登錄與核對:處理報名者匯款資料的登錄與出納核對作業
  • +
  • 沖帳流程:處理個人與共同支付的沖帳作業,以及剩餘金額的核銷
  • +
  • 查詢功能:提供各類沖帳記錄的查詢與統計功能
  • +
+
- -
-
-
-
- 系統說明 -
-
    -
  • 匯款登錄與核對:處理報名者匯款資料的登錄與出納核對作業
  • -
  • 沖帳流程:處理個人與共同支付的沖帳作業,以及剩餘金額的核銷
  • -
  • 查詢功能:提供各類沖帳記錄的查詢與統計功能
  • -
-
-
-
-
+ + + + + - - - - - - - - - + + - - + \ No newline at end of file diff --git a/web/admin/bill/index.aspx.cs b/web/admin/bill/index.aspx.cs index ba3cc04..55be087 100644 --- a/web/admin/bill/index.aspx.cs +++ b/web/admin/bill/index.aspx.cs @@ -5,10 +5,11 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -public partial class admin_bill_index : System.Web.UI.Page +public partial class admin_bill_index : MyWeb.config { + protected void Page_Load(object sender, EventArgs e) { - + } } \ No newline at end of file diff --git a/web/admin/bill/personal_reconcile.vue b/web/admin/bill/personal_reconcile.vue new file mode 100644 index 0000000..3da8635 --- /dev/null +++ b/web/admin/bill/personal_reconcile.vue @@ -0,0 +1,510 @@ + + \ No newline at end of file diff --git a/web/admin/bill/register.vue b/web/admin/bill/register.vue new file mode 100644 index 0000000..518304f --- /dev/null +++ b/web/admin/bill/register.vue @@ -0,0 +1,193 @@ + + + + \ No newline at end of file diff --git a/web/admin/bill/verify.vue b/web/admin/bill/verify.vue new file mode 100644 index 0000000..4e8dab0 --- /dev/null +++ b/web/admin/bill/verify.vue @@ -0,0 +1,461 @@ + + + \ No newline at end of file diff --git a/web/admin/bill/verify_order_record_query.vue b/web/admin/bill/verify_order_record_query.vue new file mode 100644 index 0000000..a5cc798 --- /dev/null +++ b/web/admin/bill/verify_order_record_query.vue @@ -0,0 +1,382 @@ + + + + + \ No newline at end of file diff --git a/web/js/httpVueLoader.js b/web/js/httpVueLoader.js new file mode 100644 index 0000000..9bb2d9f --- /dev/null +++ b/web/js/httpVueLoader.js @@ -0,0 +1,478 @@ +(function umd(root,factory){ + if(typeof module==='object' && typeof exports === 'object' ) + module.exports=factory() + else if(typeof define==='function' && define.amd) + define([],factory) + else + root.httpVueLoader=factory() +})(this,function factory() { + 'use strict'; + + var scopeIndex = 0; + + StyleContext.prototype = { + + withBase: function(callback) { + + var tmpBaseElt; + if ( this.component.baseURI ) { + + // firefox and chrome need the to be set while inserting or modifying