Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e02047ae57 | ||
|
|
a6e8e5b8cd |
No files matched your search
@@ -157,10 +157,18 @@
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<DataGridTextColumn
|
||||
Width="50*"
|
||||
Header="序号"
|
||||
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
|
||||
<DataGridTextColumn
|
||||
Width="100*"
|
||||
Header="AppId"
|
||||
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
|
||||
<DataGridTextColumn
|
||||
Width="100*"
|
||||
Header="店铺编号"
|
||||
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
|
||||
<DataGridTextColumn
|
||||
Width="100*"
|
||||
Header="店铺名称"
|
||||
@@ -224,7 +232,9 @@
|
||||
<Grid x:Name="gridListItem">
|
||||
<Grid.ColumnDefinitions>
|
||||
<!--<ColumnDefinition Width="{Binding colShopIdWidth,RelativeSource={RelativeSource AncestorType={x:Type local:ShopListCtrl}}}" ></ColumnDefinition>-->
|
||||
<ColumnDefinition x:Name="colCheck" Width="100*" />
|
||||
<ColumnDefinition x:Name="colCheck" Width="50*" />
|
||||
<ColumnDefinition x:Name="colIndex" Width="50*" />
|
||||
<ColumnDefinition x:Name="colAppId" Width="100*" />
|
||||
<ColumnDefinition x:Name="colShopId" Width="100*" />
|
||||
<ColumnDefinition x:Name="colShopName" Width="100*" />
|
||||
<ColumnDefinition x:Name="colGroupName" Width="100*" />
|
||||
@@ -245,8 +255,7 @@
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Tag="{Binding ShopId}"
|
||||
Text="{Binding ShopId}"
|
||||
Text="{Binding Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Converter={StaticResource listBoxIndexConverter}}"
|
||||
TextWrapping="Wrap" />
|
||||
<TextBox
|
||||
Grid.Column="2"
|
||||
@@ -256,7 +265,7 @@
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Tag="{Binding ShopId}"
|
||||
Text="{Binding ShopAccount}"
|
||||
Text="{Binding ShopId}"
|
||||
TextWrapping="Wrap" />
|
||||
<TextBox
|
||||
Grid.Column="3"
|
||||
@@ -265,11 +274,31 @@
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Tag="{Binding ErpShopId}"
|
||||
Text="{Binding ErpShopId}"
|
||||
TextWrapping="Wrap" />
|
||||
<TextBox
|
||||
Grid.Column="4"
|
||||
HorizontalContentAlignment="Center"
|
||||
VerticalContentAlignment="Center"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Tag="{Binding ShopId}"
|
||||
Text="{Binding ShopAccount}"
|
||||
TextWrapping="Wrap" />
|
||||
<TextBox
|
||||
Grid.Column="5"
|
||||
HorizontalContentAlignment="Center"
|
||||
VerticalContentAlignment="Center"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Tag="{Binding ShopId}"
|
||||
Text="{Binding GroupName}"
|
||||
TextWrapping="Wrap" />
|
||||
<TextBox
|
||||
Grid.Column="4"
|
||||
Grid.Column="6"
|
||||
HorizontalContentAlignment="Center"
|
||||
VerticalContentAlignment="Center"
|
||||
Background="Transparent"
|
||||
|
||||
@@ -222,8 +222,8 @@
|
||||
Background="#7F000000"
|
||||
Visibility="Hidden">
|
||||
<Border
|
||||
Width="500"
|
||||
Height="600"
|
||||
Width="850"
|
||||
Height="650"
|
||||
Background="White"
|
||||
CornerRadius="4">
|
||||
<shopctrls:ShopListCtrl
|
||||
|
||||
Reference in new issue
Block a user