pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

输入模式

qianyi
shanji 3 years ago
parent
5add3d9e15
commit
2beb9e8fca
4 changed files with 81 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs
  2. 8
      BBWY.Client/Resources/Themes/Path.xaml
  3. 20
      BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs
  4. 39
      BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml

19
BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs
View File

@ -7,6 +7,7 @@ namespace BBWY.Client.Models
private AuditCapitalType? auditCapitalType;
private string customAuditCapitalType;
private string errorMessage;
private int auditCapitalTypeInputMode;
/// <summary>
/// 是否发生过变化
@ -98,9 +99,13 @@ namespace BBWY.Client.Models
IsChanged = true;
ErrorMessage = string.Empty;
if (value != Models.AuditCapitalType.自定义)
{
AuditCapitalTypeInputMode = 0;
CustomAuditCapitalType = string.Empty;
}
else
AuditCapitalTypeInputMode = 1;
}
}
}
@ -128,6 +133,18 @@ namespace BBWY.Client.Models
set { Set(ref customAuditCapitalType, value); }
}
/// <summary>
/// 资金类型输入状态 (0=选择 1=输入)
/// </summary>
public int AuditCapitalTypeInputMode
{
get => auditCapitalTypeInputMode;
set
{
Set(ref auditCapitalTypeInputMode, value);
}
}
public override string ToString()
{
return $"{PayBillNo},{SourceMerchantOrderNo},{PayBillType},{PayTime},{OppositeAccount},{IncomeAmount},{ExpenditureAmount},{AuditCapitalType},{BelongShop},{RelationPurchaseOrderId},{RelationShopOrderId},{OrderStartTime},{PurchasePlatform},{Remark},{ErrorMessage}";

8
BBWY.Client/Resources/Themes/Path.xaml
View File

@ -26,4 +26,12 @@
<Style x:Key="path_close" TargetType="Path" BasedOn="{StaticResource basePath}">
<Setter Property="Data" Value="M814.060 781.227q-67.241-67.241-269.773-269.773 67.241-67.241 269.773-269.773 5.671-6.481 5.671-12.962 0 0-0.81-0.81 0-6.481-4.861-9.722-4.861-4.051-11.342-4.861-0.81 0-0.81 0-5.671 0-11.342 4.861-89.924 89.924-269.773 269.773-67.241-67.241-269.773-269.773-4.861-4.861-12.962-4.861-7.291 0.81-10.532 4.861-5.671 5.671-5.671 11.342 0 6.481 5.671 12.152 89.924 89.924 269.773 269.773-67.241 67.241-269.773 269.773-11.342 11.342 0 23.494 12.152 11.342 23.494 0 89.924-89.924 269.773-269.773 67.241 67.241 269.773 269.773 5.671 5.671 11.342 5.671 5.671 0 12.152-5.671 4.861-5.671 4.861-12.962 0-6.481-4.861-10.532z"/>
</Style>
<Style x:Key="path_input" TargetType="Path" BasedOn="{StaticResource basePath}">
<Setter Property="Data" Value="M4.234565,23.060143L3.3980846,26.498995 5.6062109,28.670895 9.1839902,27.854559z M20.369981,6.6974076L5.4623272,21.465012 10.698205,26.536911 25.463305,11.631243z M24.268012,2.8359963L21.791127,5.2896117 26.870864,10.210285 29.195014,7.8640078z M24.290015,0L32.002999,7.8720034 10.464999,29.613993 0,31.999001 2.5469978,21.53801z"/>
</Style>
<Style x:Key="path_list" TargetType="Path" BasedOn="{StaticResource basePath}">
<Setter Property="Data" Value="M8,23.000008L32,23.000008 32,25.000008 8,25.000008z M0,22L4,22 4,26 0,26z M8,12L32,12 32,14 8,14z M0,11L4,11 4,15 0,15z M8,1L32,1 32,3 8,3z M0,0L4,0 4,4 0,4z"/>
</Style>
</ResourceDictionary>

20
BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs
View File

@ -104,6 +104,10 @@ namespace BBWY.Client.ViewModels
public ICommand ExportCommand { get; set; }
public ICommand ShowAuditCapitalTypeInputModeCommand { get; set; }
public ICommand HideAuditCapitalTypeInputModeCommand { get; set; }
public Shop SelectResultShop { get => selectResultShop; set { Set(ref selectResultShop, value); } }
public bool NoMatchPurchaseOrder { get => noMatchPurchaseOrder; set { Set(ref noMatchPurchaseOrder, value); } }
@ -125,6 +129,8 @@ namespace BBWY.Client.ViewModels
ClearLocalConditionCommand = new RelayCommand(() => ClearLocalCondition());
SaveCommand = new RelayCommand(Save);
ExportCommand = new RelayCommand(Export);
ShowAuditCapitalTypeInputModeCommand = new RelayCommand<AuditPayBill>(ShowAuditCapitalTypeInputMode);
HideAuditCapitalTypeInputModeCommand = new RelayCommand<AuditPayBill>(HideAuditCapitalTypeInputMode);
this.purchaseOrderService = purchaseOrderService;
this.financialTerminalService = financialTerminalService;
@ -165,7 +171,11 @@ namespace BBWY.Client.ViewModels
App.Current.Dispatcher.Invoke(() =>
{
foreach (var b in list)
{
if (!string.IsNullOrEmpty(b.CustomAuditCapitalType))
b.AuditCapitalTypeInputMode = 1;
AuditPayBillList.Add(b);
}
SearchLocal();
});
});
@ -572,5 +582,15 @@ namespace BBWY.Client.ViewModels
MessageBox.Show(ex.Message, "导出审计结果");
}
}
private void ShowAuditCapitalTypeInputMode(AuditPayBill auditPayBill)
{
auditPayBill.AuditCapitalTypeInputMode = 1;
}
private void HideAuditCapitalTypeInputMode(AuditPayBill auditPayBill)
{
auditPayBill.AuditCapitalTypeInputMode = 0;
}
}
}

39
BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml
View File

@ -211,12 +211,43 @@
<DataGridTextColumn Header="对方账号" Width="100" Binding="{Binding OppositeAccount}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
<DataGridTextColumn Header="收入金额" Width="60" Binding="{Binding IncomeAmount}" ElementStyle="{StaticResource middleTextBlock}"/>
<DataGridTextColumn Header="支出金额" Width="60" Binding="{Binding ExpenditureAmount}" ElementStyle="{StaticResource middleTextBlock}"/>
<DataGridTemplateColumn Header="资金类型" Width="100">
<DataGridTemplateColumn Header="资金类型" Width="120">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<ComboBox ItemsSource="{Binding Source={StaticResource auditCapitalTypeProvider}}"
SelectedItem="{Binding AuditCapitalType,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
VerticalContentAlignment="Center"/>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<ComboBox ItemsSource="{Binding Source={StaticResource auditCapitalTypeProvider}}"
SelectedItem="{Binding AuditCapitalType,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
VerticalContentAlignment="Center"
Visibility="{Binding AuditCapitalTypeInputMode,ConverterParameter=0:Visible:Collapsed,Converter={StaticResource objConverter}}"/>
<c:BTextBox Text="{Binding CustomAuditCapitalType,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding AuditCapitalTypeInputMode,ConverterParameter=1:Visible:Collapsed,Converter={StaticResource objConverter}}"
WaterRemark="自定义资金类型"/>
<c:BButton Grid.Column="1" Margin="3,0"
Background="Transparent"
CommandParameter="{Binding }"
Command="{Binding DataContext.ShowAuditCapitalTypeInputModeCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
<Path Style="{StaticResource path_input}" Width="16"/>
<c:BButton.Visibility>
<MultiBinding ConverterParameter="自定义;0:&amp;:Visible:Collapsed:1" Converter="{StaticResource mobjConverter}">
<Binding Path="AuditCapitalType"/>
<Binding Path="AuditCapitalTypeInputMode"/>
</MultiBinding>
</c:BButton.Visibility>
</c:BButton>
<c:BButton Grid.Column="1" Margin="3,0"
Background="Transparent"
CommandParameter="{Binding }"
Command="{Binding DataContext.HideAuditCapitalTypeInputModeCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
Visibility="{Binding AuditCapitalTypeInputMode,ConverterParameter=1:Visible:Collapsed,Converter={StaticResource objConverter}}">
<Path Style="{StaticResource path_list}" Width="16"/>
</c:BButton>
</Grid>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>

Write Preview
Loading…
Cancel
Save