Browse Source

调整。

master
yibo 7 years ago
parent
commit
d4fab0c471
3 changed files with 18 additions and 9 deletions
  1. +5
    -5
      B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/Pay_/PayEdit.cs
  2. +5
    -1
      B3SheepButcherManage/BO/Bill/FixedPrice/FixedPrice.cs
  3. +8
    -3
      B3SheepButcherManage/BO/Bill/Pay/Pay.cs

+ 5
- 5
B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/Pay_/PayEdit.cs View File

@ -37,7 +37,7 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Bills.Pay_
config.Add("Date"); config.Add("Date");
config.Add("Supplier_ID"); config.Add("Supplier_ID");
config.Add("Supplier_Bank"); config.Add("Supplier_Bank");
config.Add("Supplier_BankAccount");
config.Add("Supplier_Card_ID");
config.Add("Account_ID"); config.Add("Account_ID");
config.Add("Account_BankAccountNumber"); config.Add("Account_BankAccountNumber");
config.Add("PaySupplier_ID"); config.Add("PaySupplier_ID");
@ -80,7 +80,7 @@ __DFContainer.setValue('PaySupplier_AccountNo','');
{ {
var script = @" var script = @"
var txtValue =parseInt(__DFContainer.getValue('Supplier_ID')); var txtValue =parseInt(__DFContainer.getValue('Supplier_ID'));
simpleRestCall('/MainSystem/B3CowButcherManage/Rpcs/SupplierRpc/GetBySupplierID',[txtValue,['Bank','BankAccount']],
simpleRestCall('/MainSystem/B3CowButcherManage/Rpcs/SupplierRpc/GetBySupplierID',[txtValue,['Bank','Card_ID']],
function(result){ function(result){
if(typeof(result.Bank)!='undefined') if(typeof(result.Bank)!='undefined')
{ {
@ -90,13 +90,13 @@ else
{ {
__DFContainer.setValue('Supplier_Bank',''); __DFContainer.setValue('Supplier_Bank','');
} }
if(typeof(result.BankAccount)!='undefined')
if(typeof(result.Card_ID)!='undefined')
{ {
__DFContainer.setValue('Supplier_BankAccount',result.BankAccount);
__DFContainer.setValue('Supplier_Card_ID',result.Card_ID);
} }
else else
{ {
__DFContainer.setValue('Supplier_BankAccount','');
__DFContainer.setValue('Supplier_Card_ID','');
} }
},{ });"; },{ });";
paySupplierInput.OnClientSelected = script; paySupplierInput.OnClientSelected = script;


+ 5
- 1
B3SheepButcherManage/BO/Bill/FixedPrice/FixedPrice.cs View File

@ -8,6 +8,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using TSingSoft.WebControls2;
namespace BWP.B3SheepButcherManage.BO namespace BWP.B3SheepButcherManage.BO
{ {
@ -17,8 +18,11 @@ namespace BWP.B3SheepButcherManage.BO
[EditUrl("~/B3SheepButcherManage/Bills/FixedPrice_/FixedPriceEdit.aspx")] [EditUrl("~/B3SheepButcherManage/Bills/FixedPrice_/FixedPriceEdit.aspx")]
public class FixedPrice : DepartmentWorkFlowBill public class FixedPrice : DepartmentWorkFlowBill
{ {
DateTime? dt = DateTime.Now;
[LogicName("执行时间")] [LogicName("执行时间")]
public DateTime? ExeTime { get; set; }
[DFExtProperty("WebControlType", DFEditControl.DateTimeInput)]
[DFNotEmpty]
public DateTime? ExeTime { get { return dt; } set { dt = value; } }
private FixedPrice_DetailCollection _detail = new FixedPrice_DetailCollection(); private FixedPrice_DetailCollection _detail = new FixedPrice_DetailCollection();
[OneToMany(typeof(FixedPrice_Detail), "ID")] [OneToMany(typeof(FixedPrice_Detail), "ID")]


+ 8
- 3
B3SheepButcherManage/BO/Bill/Pay/Pay.cs View File

@ -87,10 +87,15 @@ namespace BWP.B3SheepButcherManage.BO
[Join("Supplier_ID", "ID")] [Join("Supplier_ID", "ID")]
public string Supplier_Bank { get; set; } public string Supplier_Bank { get; set; }
[LogicName("银行账号")]
[ReferenceTo(typeof(Supplier), "BankAccount")]
//[LogicName("银行账号")]
//[ReferenceTo(typeof(Supplier), "BankAccount")]
//[Join("Supplier_ID", "ID")]
//public string Supplier_BankAccount { get; set; }
[LogicName("身份证号")]
[ReferenceTo(typeof(Supplier), "Card_ID")]
[Join("Supplier_ID", "ID")] [Join("Supplier_ID", "ID")]
public string Supplier_BankAccount { get; set; }
public string Supplier_Card_ID { get; set; }
[LogicName("付款账户")] [LogicName("付款账户")]
[ReferenceTo(typeof(Account), "Name")] [ReferenceTo(typeof(Account), "Name")]


Loading…
Cancel
Save