Browse Source

修改质检合格证ui

AddValidOverTime
506583276@qq.com 2 years ago
parent
commit
a367618d57
  1. 36
      BBWY.Client/APIServices/ProductService.cs
  2. 2
      BBWY.Client/BBWYAppSettings.json
  3. 2
      BBWY.Client/GlobalContext.cs
  4. 7
      BBWY.Client/Models/Enums.cs
  5. 2
      BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs
  6. 3
      BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
  7. 216
      BBWY.Client/Views/QualityTask/QualitySetCerWindow.xaml
  8. 107
      BBWY.Client/Views/QualityTask/QualitySetCerWindow.xaml.cs
  9. 2
      BBWY.Client/Views/QualityTask/WaitQualityControl.xaml

36
BBWY.Client/APIServices/ProductService.cs

@ -28,22 +28,7 @@ namespace BBWY.Client.APIServices
null,
HttpMethod.Post);
}
public ApiResponse<IList<ProductSku>> GetProductSkuList(string spu, string sku,Platform platform,string appKey,string appSecret,string appToken)
{
return SendRequest<IList<ProductSku>>(globalContext.BBYWApiHost,
"api/product/GetProductSkuList",
new
{
Spu = spu,
Sku = sku,
Platform = platform,
AppKey = appKey,
AppSecret = appSecret,
AppToken = appToken
},
null,
HttpMethod.Post);
}
public ApiResponse<IList<ProductSku>> GetProductSkuList(string spu, string sku)
{
return SendRequest<IList<ProductSku>>(globalContext.BBYWApiHost,
@ -61,6 +46,25 @@ namespace BBWY.Client.APIServices
HttpMethod.Post);
}
public ApiResponse<IList<ProductSku>> GetProductSkuList(string spu, string sku, Platform platform, string appKey, string appSecret, string appToken)
{
return SendRequest<IList<ProductSku>>(globalContext.BBYWApiHost,
"api/product/GetProductSkuList",
new
{
Spu = spu,
Sku = sku,
Platform = platform,
AppKey = appKey,
AppSecret = appSecret,
AppToken = appToken
},
null,
HttpMethod.Post);
}
public ApiResponse<ProductListResponse> GetProductList(string spu, string productName, string productItem, int pageIndex, Platform platform, string appKey, string appSecret, string appToken)
{
return SendRequest<ProductListResponse>(globalContext.BBYWApiHost,

2
BBWY.Client/BBWYAppSettings.json

@ -5,5 +5,5 @@
"JOSApiHost": "",
"1688ApiHost": "",
"QKApiHost": "http://localhost:8080"
// "QKApiHost": "http://qiku.qiyue666.com"
// "QKApiHost": "http://qiku.qiyue666.com"
}

2
BBWY.Client/GlobalContext.cs

@ -13,7 +13,7 @@ namespace BBWY.Client
{
ShopServiceGroupList = new List<string>();
ShopServiceGroupLowerList = new List<string>();
ClientVersion = "10169";
ClientVersion = "10170";
}
private User user;

7
BBWY.Client/Models/Enums.cs

@ -554,4 +554,11 @@
= 2
}
public enum QualityLookState
{
}
}

2
BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs

@ -436,7 +436,7 @@ namespace BBWY.Client.ViewModels.PackTask
if (!string.IsNullOrEmpty(BrandName))
model.CerDTO.BrandName = BrandName;
QualitySetCerWindow setCerWindow = new QualitySetCerWindow();
QualitySetCerWindow setCerWindow = new QualitySetCerWindow(false);
setCerWindow.LoadData(model.IsNeedCer, model.CerDTO, packPurchaseTaskService, spuCertificateModel, IsSetSpuCertificate, SaveType);
setCerWindow.SaveResult = (s, PackCerState) =>
{

3
BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs

@ -585,7 +585,8 @@ namespace BBWY.Client.ViewModels
if (!string.IsNullOrEmpty(BrandName))
model.CerDTO.BrandName = BrandName;
QualitySetCerWindow setCerWindow = new QualitySetCerWindow();
QualitySetCerWindow setCerWindow = new QualitySetCerWindow(model.IsSetCertificate);
setCerWindow.LoadData(model.IsNeedCer, model.CerDTO, packPurchaseTaskService, spuCertificateModel, IsSetSpuCertificate, saveType);
setCerWindow.SaveResult = (s, PackCerState) =>
{

216
BBWY.Client/Views/QualityTask/QualitySetCerWindow.xaml

@ -42,7 +42,221 @@
</StackPanel>
<Grid Grid.Row="1" Visibility="{Binding PackCerState,Mode=TwoWay,Converter={StaticResource objConverter},ConverterParameter=合格证信息:Visible:Collapsed}">
<local:QualitySetCerControl model="{Binding CertificateModel,Mode=TwoWay}"/>
<!--<local:QualitySetCerControl model="{Binding CertificateModel,Mode=TwoWay}"/>-->
<Grid >
<Grid.RowDefinitions>
<RowDefinition Height="40"/>
<RowDefinition/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal">
<RadioButton GroupName="cer" HorizontalAlignment="Left" VerticalContentAlignment="Center" IsChecked="{Binding CertificateModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:CertificateLabelModel.标准无3c}}" CommandParameter="{x:Static cmodel:CertificateLabelModel.标准无3c}" Content="标准" Margin="10,0,0,0" Height="30" VerticalAlignment="Top"/>
<RadioButton GroupName="cer" HorizontalAlignment="Left" VerticalContentAlignment="Center" IsChecked="{Binding CertificateModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:CertificateLabelModel.标准有3c}}" CommandParameter="{x:Static cmodel:CertificateLabelModel.标准有3c}" Content="带3c标" Margin="10,0,0,0" Height="30" VerticalAlignment="Top"/>
<RadioButton GroupName="cer" HorizontalAlignment="Left" VerticalContentAlignment="Center" IsChecked="{Binding CertificateModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:CertificateLabelModel.无型号}}" CommandParameter="{x:Static cmodel:CertificateLabelModel.无型号}" Content="无型号" Margin="10,0,0,0" Height="30" VerticalAlignment="Top"/>
<RadioButton GroupName="cer" HorizontalAlignment="Left" VerticalContentAlignment="Center" IsChecked="{Binding CertificateModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:CertificateLabelModel.适用年龄 }}" CommandParameter="{x:Static cmodel:CertificateLabelModel.适用年龄}" Content="适用年龄" Margin="10,0,0,0" Height="30" VerticalAlignment="Top"/>
</StackPanel>
<DockPanel Grid.Row="1" >
<Border Visibility="{Binding CertificateModel.LabelModel,Converter={StaticResource objConverter}, ConverterParameter=无型号:Visible:Collapsed}" BorderBrush="Black" BorderThickness="1" Width="380" Height="298" Margin="1" VerticalAlignment="Top" HorizontalAlignment="Left">
<StackPanel Orientation="Vertical">
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Center" Text="合格证" FontSize="18" Margin="0 10 0 25" />
<StackPanel Orientation="Horizontal">
<TextBlock Text="品牌:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0" />
<c:BTextBox Height="25" IsReadOnly="True" Text="{Binding CertificateModel.Brand,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" />
<TextBlock Text="品名:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0"/>
<c:BTextBox Height="25" Text="{Binding CertificateModel.BrandName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0 10 0 10">
<TextBlock Text="材质:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0"/>
<Grid>
<c:BButton Visibility="{Binding IsShowShader,Converter={StaticResource objConverter},ConverterParameter=True:Visible:Collapsed}" Style="{StaticResource LinkButton}" Content="点击查看" Panel.ZIndex="10" Foreground="Red" CommandParameter="材质" Command="{Binding ShowDataCommand}" Width="126"/>
<c:BTextBox Visibility="{Binding IsShowShader,Converter={StaticResource objConverter},ConverterParameter=True:Collapsed:Visible}" Height="25" Text="{Binding CertificateModel.Shader,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left"/>
</Grid>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="执行标准:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="6 0 0 0" />
<Grid>
<c:BButton Visibility="{Binding IsShowExcuteStander,Converter={StaticResource objConverter},ConverterParameter=True:Visible:Collapsed}" Style="{StaticResource LinkButton}" Content="点击查看" Panel.ZIndex="10" Foreground="Red" CommandParameter="执行标准" Command="{Binding ShowDataCommand}" Width="296"/>
<c:BTextBox Visibility="{Binding IsShowExcuteStander,Converter={StaticResource objConverter},ConverterParameter=True:Collapsed:Visible}" WaterRemark="如多个标准请使用逗号分隔" Height="25" Text="{Binding CertificateModel.ExcuteStander,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" />
</Grid>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0 10 0 10">
<TextBlock Text="生产日期:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="6 0 0 0" />
<c:BTextBox WaterRemark="不填则不打印" Height="25" Text="{Binding CertificateModel.ProduceDate,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="生产商:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="18 0 0 0" />
<Grid>
<c:BButton Visibility="{Binding IsShowProductShop,Converter={StaticResource objConverter},ConverterParameter=True:Visible:Collapsed}" Style="{StaticResource LinkButton}" Content="点击查看" Panel.ZIndex="10" Foreground="Red" CommandParameter="生产商" Command="{Binding ShowDataCommand}" Width="296"/>
<c:BTextBox Visibility="{Binding IsShowProductShop,Converter={StaticResource objConverter},ConverterParameter=True:Collapsed:Visible}" Height="25" Text="{Binding CertificateModel.ProductShop,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left"/>
</Grid>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0 10 0 0">
<TextBlock Text="地址:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30 0 0 0" />
<Grid>
<c:BButton Visibility="{Binding IsShowProductAdress,Converter={StaticResource objConverter},ConverterParameter=True:Visible:Collapsed}" Style="{StaticResource LinkButton}" Content="点击查看" Panel.ZIndex="10" Foreground="Red" CommandParameter="地址" Command="{Binding ShowDataCommand}" Width="296"/>
<c:BTextBox Visibility="{Binding IsShowProductAdress,Converter={StaticResource objConverter},ConverterParameter=True:Collapsed:Visible}" MinHeight="44" Text="{Binding CertificateModel.ProductAdress,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left"/>
</Grid>
</StackPanel>
</StackPanel>
</Border>
<Border Name="shiyongnianling" Visibility="{Binding CertificateModel.LabelModel,Converter={StaticResource objConverter}, ConverterParameter=适用年龄:Visible:Collapsed}" BorderBrush="Black" BorderThickness="1" Width="380" Height="298" Margin="1" VerticalAlignment="Top" HorizontalAlignment="Left">
<StackPanel Orientation="Vertical">
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Center" Text="合格证" FontSize="18" Margin="0 10 0 25" />
<StackPanel Orientation="Horizontal">
<TextBlock Text="品牌:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0" />
<c:BTextBox Height="25" IsReadOnly="True" Text="{Binding CertificateModel.Brand,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" />
<TextBlock Text="品名:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0"/>
<c:BTextBox Height="25" Text="{Binding CertificateModel.BrandName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0 10 0 10">
<TextBlock Text="材质:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0"/>
<Grid>
<c:BButton Visibility="{Binding IsShowShader,Converter={StaticResource objConverter},ConverterParameter=True:Visible:Collapsed}" Style="{StaticResource LinkButton}" Content="点击查看" Panel.ZIndex="10" Foreground="Red" CommandParameter="材质" Command="{Binding ShowDataCommand}" Width="126"/>
<c:BTextBox Visibility="{Binding IsShowShader,Converter={StaticResource objConverter},ConverterParameter=True:Collapsed:Visible}" Height="25" Text="{Binding CertificateModel.Shader,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left"/>
</Grid>
<TextBlock Text="适用年龄:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="6,0,0,0" />
<c:BTextBox Height="25" Text="{Binding CertificateModel.ApplyAge,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="124" VerticalAlignment="Top" HorizontalAlignment="Left"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="执行标准:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="6 0 0 0" />
<Grid>
<c:BButton Visibility="{Binding IsShowExcuteStander,Converter={StaticResource objConverter},ConverterParameter=True:Visible:Collapsed}" Style="{StaticResource LinkButton}" Content="点击查看" Panel.ZIndex="10" Foreground="Red" CommandParameter="执行标准" Command="{Binding ShowDataCommand}" Width="296"/>
<c:BTextBox Visibility="{Binding IsShowExcuteStander,Converter={StaticResource objConverter},ConverterParameter=True:Collapsed:Visible}" WaterRemark="如多个标准请使用逗号分隔" Height="25" Text="{Binding CertificateModel.ExcuteStander,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" />
</Grid>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0 10 0 10">
<TextBlock Text="生产日期:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="6 0 0 0" />
<c:BTextBox WaterRemark="不填则不打印" Height="25" Text="{Binding CertificateModel.ProduceDate,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="生产商:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="18 0 0 0" />
<Grid>
<c:BButton Visibility="{Binding IsShowProductShop,Converter={StaticResource objConverter},ConverterParameter=True:Visible:Collapsed}" Style="{StaticResource LinkButton}" Content="点击查看" Panel.ZIndex="10" Foreground="Red" CommandParameter="生产商" Command="{Binding ShowDataCommand}" Width="296"/>
<c:BTextBox Visibility="{Binding IsShowProductShop,Converter={StaticResource objConverter},ConverterParameter=True:Collapsed:Visible}" Height="25" Text="{Binding CertificateModel.ProductShop,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left"/>
</Grid>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0 10 0 0">
<TextBlock Text="地址:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30 0 0 0" />
<Grid>
<c:BButton Visibility="{Binding IsShowProductAdress,Converter={StaticResource objConverter},ConverterParameter=True:Visible:Collapsed}" Style="{StaticResource LinkButton}" Content="点击查看" Panel.ZIndex="10" Foreground="Red" CommandParameter="地址" Command="{Binding ShowDataCommand}" Width="296"/>
<c:BTextBox Visibility="{Binding IsShowProductAdress,Converter={StaticResource objConverter},ConverterParameter=True:Collapsed:Visible}" MinHeight="44" Text="{Binding CertificateModel.ProductAdress,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left"/>
</Grid>
</StackPanel>
</StackPanel>
</Border>
<Border Visibility="{Binding CertificateModel.LabelModel,Converter={StaticResource objConverter}, ConverterParameter=标准无3c:Visible:Collapsed}" BorderBrush="Black" BorderThickness="1" Width="380" Height="298" Margin="1" VerticalAlignment="Top" HorizontalAlignment="Left">
<StackPanel Orientation="Vertical">
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Center" Text="合格证" FontSize="18" Margin="0 10 0 25" />
<StackPanel Orientation="Horizontal">
<TextBlock Text="品牌:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0" />
<c:BTextBox Height="25" IsReadOnly="True" Text="{Binding CertificateModel.Brand,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" />
<TextBlock Text="型号:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0"/>
<c:BTextBox Height="25" Text="{Binding CertificateModel.ProductNo,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0 10 0 10">
<TextBlock Text="品名:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0"/>
<c:BTextBox Height="25" Text="{Binding CertificateModel.BrandName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" />
<TextBlock Text="材质:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0"/>
<Grid>
<c:BButton Visibility="{Binding IsShowShader,Converter={StaticResource objConverter},ConverterParameter=True:Visible:Collapsed}" Style="{StaticResource LinkButton}" Content="点击查看" Panel.ZIndex="10" Foreground="Red" CommandParameter="材质" Command="{Binding ShowDataCommand}" Width="126"/>
<c:BTextBox Visibility="{Binding IsShowShader,Converter={StaticResource objConverter},ConverterParameter=True:Collapsed:Visible}" Height="25" Text="{Binding CertificateModel.Shader,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left"/>
</Grid>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="执行标准:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="6 0 0 0" />
<Grid>
<c:BButton Visibility="{Binding IsShowExcuteStander,Converter={StaticResource objConverter},ConverterParameter=True:Visible:Collapsed}" Style="{StaticResource LinkButton}" Content="点击查看" Panel.ZIndex="10" Foreground="Red" CommandParameter="执行标准" Command="{Binding ShowDataCommand}" Width="296"/>
<c:BTextBox Visibility="{Binding IsShowExcuteStander,Converter={StaticResource objConverter},ConverterParameter=True:Collapsed:Visible}" WaterRemark="如多个标准请使用逗号分隔" Height="25" Text="{Binding CertificateModel.ExcuteStander,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" />
</Grid>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0 10 0 10">
<TextBlock Text="生产日期:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="6 0 0 0" />
<c:BTextBox WaterRemark="不填则不打印" Height="25" Text="{Binding CertificateModel.ProduceDate,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="生产商:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="18 0 0 0" />
<Grid>
<c:BButton Visibility="{Binding IsShowProductShop,Converter={StaticResource objConverter},ConverterParameter=True:Visible:Collapsed}" Style="{StaticResource LinkButton}" Content="点击查看" Panel.ZIndex="10" Foreground="Red" CommandParameter="生产商" Command="{Binding ShowDataCommand}" Width="296"/>
<c:BTextBox Visibility="{Binding IsShowProductShop,Converter={StaticResource objConverter},ConverterParameter=True:Collapsed:Visible}" Height="25" Text="{Binding CertificateModel.ProductShop,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left"/>
</Grid>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0 10 0 0">
<TextBlock Text="地址:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30 0 0 0" />
<Grid>
<c:BButton Visibility="{Binding IsShowProductAdress,Converter={StaticResource objConverter},ConverterParameter=True:Visible:Collapsed}" Style="{StaticResource LinkButton}" Content="点击查看" Panel.ZIndex="10" Foreground="Red" CommandParameter="地址" Command="{Binding ShowDataCommand}" Width="296"/>
<c:BTextBox Visibility="{Binding IsShowProductAdress,Converter={StaticResource objConverter},ConverterParameter=True:Collapsed:Visible}" MinHeight="44" Text="{Binding CertificateModel.ProductAdress,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left"/>
</Grid>
</StackPanel>
</StackPanel>
</Border>
<Border Visibility="{Binding CertificateModel.LabelModel,Converter={StaticResource objConverter}, ConverterParameter=标准有3c:Visible:Collapsed}" BorderBrush="Black" BorderThickness="1" Width="380" Height="298" Margin="1" VerticalAlignment="Top" HorizontalAlignment="Left">
<StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal" >
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="合格证" FontSize="18" Margin="157 0 70 0" />
<Image Source="pack://siteoforigin:,,,/Resources/Images/3c.png" Width="54" Height="40" VerticalAlignment="Top" Margin="0 5 0 0" HorizontalAlignment="Left" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0 2 0 5">
<TextBlock Text="工厂编号:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="203,0,0,0" />
<c:BTextBox Text="{Binding CertificateModel.FactoryNumber,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Height="25" Width="100" VerticalAlignment="Top" HorizontalAlignment="Left" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="品牌:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0" />
<c:BTextBox Height="25" IsReadOnly="True" Text="{Binding CertificateModel.Brand,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" />
<TextBlock Text="型号:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0"/>
<c:BTextBox Height="25" Text="{Binding CertificateModel.ProductNo,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0 10 0 10">
<TextBlock Text="品名:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0"/>
<c:BTextBox Height="25" Text="{Binding CertificateModel.BrandName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" />
<TextBlock Text="材质:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0"/>
<Grid>
<c:BButton Visibility="{Binding IsShowShader,Converter={StaticResource objConverter},ConverterParameter=True:Visible:Collapsed}" Style="{StaticResource LinkButton}" Content="点击查看" Panel.ZIndex="10" Foreground="Red" CommandParameter="材质" Command="{Binding ShowDataCommand}" Width="126"/>
<c:BTextBox Visibility="{Binding IsShowShader,Converter={StaticResource objConverter},ConverterParameter=True:Collapsed:Visible}" Height="25" Text="{Binding CertificateModel.Shader,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left"/>
</Grid>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="执行标准:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="6 0 0 0" />
<Grid>
<c:BButton Visibility="{Binding IsShowExcuteStander,Converter={StaticResource objConverter},ConverterParameter=True:Visible:Collapsed}" Style="{StaticResource LinkButton}" Content="点击查看" Panel.ZIndex="10" Foreground="Red" CommandParameter="执行标准" Command="{Binding ShowDataCommand}" Width="296"/>
<c:BTextBox Visibility="{Binding IsShowExcuteStander,Converter={StaticResource objConverter},ConverterParameter=True:Collapsed:Visible}" WaterRemark="如多个标准请使用逗号分隔" Height="25" Text="{Binding CertificateModel.ExcuteStander,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" />
</Grid>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0 10 0 10">
<TextBlock Text="生产日期:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="6 0 0 0" />
<c:BTextBox WaterRemark="不填则不打印" Height="25" Text="{Binding CertificateModel.ProduceDate,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="生产商:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="18 0 0 0" />
<Grid>
<c:BButton Visibility="{Binding IsShowProductShop,Converter={StaticResource objConverter},ConverterParameter=True:Visible:Collapsed}" Style="{StaticResource LinkButton}" Content="点击查看" Panel.ZIndex="10" Foreground="Red" CommandParameter="生产商" Command="{Binding ShowDataCommand}" Width="296"/>
<c:BTextBox Visibility="{Binding IsShowProductShop,Converter={StaticResource objConverter},ConverterParameter=True:Collapsed:Visible}" Height="25" Text="{Binding CertificateModel.ProductShop,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left"/>
</Grid>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0 10 0 0">
<TextBlock Text="地址:" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30 0 0 0" />
<Grid>
<c:BButton Visibility="{Binding IsShowProductAdress,Converter={StaticResource objConverter},ConverterParameter=True:Visible:Collapsed}" Style="{StaticResource LinkButton}" Content="点击查看" Panel.ZIndex="10" Foreground="Red" CommandParameter="地址" Command="{Binding ShowDataCommand}" Width="296"/>
<c:BTextBox Visibility="{Binding IsShowProductAdress,Converter={StaticResource objConverter},ConverterParameter=True:Collapsed:Visible}" MinHeight="44" Text="{Binding CertificateModel.ProductAdress,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left"/>
</Grid>
</StackPanel>
</StackPanel>
</Border>
</DockPanel>
<!--<c:RoundWaitProgress Play="{Binding IsLoading}" Panel.ZIndex="999"
WaitText="正在提交中"
Grid.RowSpan="4"/>-->
</Grid>
</Grid>
</Grid>

107
BBWY.Client/Views/QualityTask/QualitySetCerWindow.xaml.cs

@ -16,6 +16,9 @@ using System.Windows.Shapes;
using BBWY.Client.Extensions;
using BBWY.Client.APIServices;
using BBWY.Controls;
using System.DirectoryServices.ActiveDirectory;
using System.Threading;
using System.Threading.Tasks;
namespace BBWY.Client.Views.QualityTask
{
@ -24,10 +27,73 @@ namespace BBWY.Client.Views.QualityTask
/// </summary>
public partial class QualitySetCerWindow : BWindow
{
public QualitySetCerWindow()
public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } }
private bool isLoading;
private bool isShowProductAdress=false;
public bool IsShowProductAdress { get => isShowProductAdress; set {Set(ref isShowProductAdress,value); } }
private bool isShowShader = false;
public bool IsShowShader { get => isShowShader; set { Set(ref isShowShader, value); } }
private bool isShowProductShop = false;
public bool IsShowProductShop { get => isShowProductShop; set { Set(ref isShowProductShop, value); } }
private bool isShowExcuteStander = false;
public bool IsShowExcuteStander { get => isShowExcuteStander; set { Set(ref isShowExcuteStander, value); } }
public QualitySetCerWindow( bool IsQualityTask)
{
InitializeComponent();
SetPackCerStateCommand = new RelayCommand<PackCerState>(SetPackCerState);
ShowDataCommand = new RelayCommand<string>(ShowData);
if (IsQualityTask)
{
IsShowShader = true;
IsShowExcuteStander = true;
IsShowProductShop = true;
IsShowProductAdress = true;
}
}
private void ShowData(string obj)
{
if (IsLoading)
{
return;
}
if (obj== "材质")
{
IsShowShader = false;
}
if (obj == "生产商")
{
IsShowProductShop = false;
}
if (obj == "执行标准")
{
IsShowExcuteStander = false;
}
if (obj == "地址")
{
IsShowProductAdress = false;
}
IsLoading = true;
Task.Factory.StartNew(() => {
Thread.Sleep(1000);
IsLoading = false;
});
}
private void SetPackCerState(PackCerState obj)
@ -47,6 +113,9 @@ namespace BBWY.Client.Views.QualityTask
public SaveType? SaveType { get; set; }
public ICommand SetPackCerStateCommand { get; set; }
public ICommand ShowDataCommand { get; set; }
public PackCerState PackCerState
{
@ -69,6 +138,7 @@ namespace BBWY.Client.Views.QualityTask
public bool IsSetSpuCertificate { get; set; }
public PackPurchaseTaskService packTaskService { get; set; }
public CertificateModel CertificateModel { get; set; }
public CertificateModel SpuCertificateModel { get; set; }
public Action<CertificateModel, PackCerState> SaveResult { get; set; }
@ -77,12 +147,20 @@ namespace BBWY.Client.Views.QualityTask
private void save_btn_Click(object sender, RoutedEventArgs e)
{
if (PackCerState== PackCerState.)
{
if (SaveResult != null) SaveResult(CertificateModel, PackCerState);
this.Close();
return;
}
if (string.IsNullOrEmpty(CertificateModel.ExcuteStander)
|| string.IsNullOrEmpty(CertificateModel.Shader) || string.IsNullOrEmpty(CertificateModel.BrandName)
|| string.IsNullOrEmpty(CertificateModel.Brand) || string.IsNullOrEmpty(CertificateModel.ProductShop)
@ -107,6 +185,33 @@ namespace BBWY.Client.Views.QualityTask
MessageBox.Show("适用年龄不能为空");
return;
}
if (IsShowShader)
{
MessageBox.Show("请先确认材质");
return;
}
if (IsShowProductShop)
{
MessageBox.Show("请先确认生产商");
return;
}
if (IsShowExcuteStander)
{
MessageBox.Show("请先确认执行标准");
return;
}
if (IsShowProductAdress)
{
MessageBox.Show("请先确认地址");
return;
}
var standers = CertificateModel.ExcuteStander.Split(',', StringSplitOptions.RemoveEmptyEntries);
var resData = packTaskService.SaveCer(new CerRequest
{

2
BBWY.Client/Views/QualityTask/WaitQualityControl.xaml

@ -194,8 +194,6 @@
<TextBlock Text="服务 耗材费用" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="包装员" Grid.Column="11" Style="{StaticResource middleTextBlock}"/>-->
<TextBlock Text="操作" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
<!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>

Loading…
Cancel
Save