20211021

wispro.sp.api/Controllers/PerformanceItemController.cs

@@ -134,7 +134,7 @@ namespace wispro.sp.api.Controllers
             var results = Context.PerformanceItems
                 .Where<PerformanceItem>(s => 
                     (s.ItemStaffs.Where<ItemStaff>(iStaff => iStaff.DoPerson.Name == User.Identity.Name).Count() > 0 || s.Reviewer.Name == User.Identity.Name) 
-                    && s.CalMonth.Month == 7 && s.CalMonth.Year == 2021);
+                    && s.CalMonth.Status != 4);
 
             ret.TotalCount = results.Count();
 

wispro.sp.web/Components/PerformanceItemRow.razor

@@ -22,9 +22,9 @@
 <AntDesign.Column Title="内部期限" TData="string" Width="100">@(EditingItem.InternalDate .HasValue? EditingItem.InternalDate.Value.ToString("yyyy-MM-dd"):"")</AntDesign.Column>
 <AntDesign.Column Title="案件阶段" TData="string" Width="100">@EditingItem.CaseStage</AntDesign.Column>
 <AntDesign.Column Title="案件名称" TData="string" @bind-Field="EditingItem.CaseName" Width="250"></AntDesign.Column>
-<AntDesign.Column Title="案件状态" @bind-Field="EditingItem.CaseState" Width="100"></AntDesign.Column>
-<AntDesign.Column Title=" 申请人" @bind-Field="EditingItem.ApplicationName" Width="200"></AntDesign.Column>
-<AntDesign.Column Title="备注" @bind-Field="EditingItem.CaseMemo"></AntDesign.Column>
+<AntDesign.Column Title="案件状态" @bind-Field="@EditingItem.CaseState" Width="100"></AntDesign.Column>
+<AntDesign.Column Title=" 申请人" @bind-Field="@EditingItem.ApplicationName" Width="200"></AntDesign.Column>
+<AntDesign.Column Title="备注" @bind-Field="@EditingItem.CaseMemo"></AntDesign.Column>
 
 <ActionColumn Fixed="right" Title="绩效特殊字段填写与操作" Width="350">
     <Space>

wispro.sp.web/Pages/AppCase/MyCaselist.razor

@@ -29,7 +29,7 @@
                             }
                             else
                             {
-                                <PageHeader >
+                                <PageHeader>
                                     <PageHeaderTitle>基础点数统计</PageHeaderTitle>
                                     <PageHeaderExtra><Button Type="@ButtonType.Primary">缺失数据提报</Button></PageHeaderExtra>
                                     <PageHeaderContent>
@@ -83,24 +83,91 @@
                                     </PageHeaderContent>
                                 </PageHeader>
                                 @*<AntList TItem="PerformanceItem"
-                                         DataSource="@_Datas"
-                                         Class="activitiesList"
-                                         Size="large"
-                                         ItemLayout="ListItemLayout.Horizontal">
-                                    <PerformanceItemDescriptionItem EditingItem="context" OnSubmitShenSu="OnsubShensu" OnSWJXSF="OnJXCal"></PerformanceItemDescriptionItem>
-                                </AntList>*@
+                     DataSource="@_Datas"
+                     Class="activitiesList"
+                     Size="large"
+                     ItemLayout="ListItemLayout.Horizontal">
+                <PerformanceItemDescriptionItem EditingItem="context" OnSubmitShenSu="OnsubShensu" OnSWJXSF="OnJXCal"></PerformanceItemDescriptionItem>
+            </AntList>*@
                                 @*<Pagination @bind-Current="_pageIndex"  @bind-Total="@_total"  ShowSizeChanger  OnChange="OnChange"/>*@
-                        <AntDesign.Table DataSource="_Datas" TItem="PerformanceItem"
-                                         PageIndex="_pageIndex"
-                                         PageSize="_pageSize" Total="_total"
-                                         ScrollX="3800" Size="TableSize.Small" Bordered
-                                         @bind-SelectedRows="selectedItems"
-                                         Loading="_loading" RowClassName="@(x => x.Data.isDanger()?"danger":"")">
-                                         @*OnChange="HandleTableChange" RemoteDataSource>*@
-                            <PerformanceItemRow EditingItem="context" OnSubmitShenSu="OnsubShensu" OnSWJXSF="OnJXCal"></PerformanceItemRow>
-                        </AntDesign.Table>
-                            }
-                        </Card>
+
+                                <AntDesign.Table DataSource="_Datas" TItem="PerformanceItem"
+                                                 PageIndex="_pageIndex"
+                                                 PageSize="_pageSize" Total="_total"
+                                                 ScrollX="3800" Size="TableSize.Small" Bordered
+                                                 @bind-SelectedRows="selectedItems"
+                                                 Loading="_loading" 
+                                                 OnChange="HandleTableChange" RemoteDataSource>
+                                    <Selection Key="@(context.Id.ToString())" Width="50" Fixed="left" />
+                                    <AntDesign.Column Title="我方文号" @bind-Field="@context.CaseNo" Width="150" Sortable Filterable Fixed="left" />
+                                    <AntDesign.Column Title="案件类型" @bind-Field="@context.CaseType" Width="120" Sortable Filterable />
+                                    <AntDesign.Column Title="案件系数" @bind-Field="@context.CaseCoefficient" Width="120" Sortable Filterable />
+                                    <AntDesign.Column Title="处理事项" @bind-Field="@context.DoItem" Width="120" Sortable Filterable />
+                                    <AntDesign.Column Title="处理事项系数" @bind-Field="@context.DoItemCoefficient" Width="150" Sortable Filterable />
+                                    <AntDesign.Column Title="处理人" TData="string" DataIndex="@nameof(context.ItemStaffs)" Width="150">
+                                        @if (context.ItemStaffs != null)
+                                        {
+                                            foreach (ItemStaff itemStaff in context.ItemStaffs)
+                                            {
+                                                <span>@(itemStaff.DoPerson.Name)&nbsp;</span>
+                                            }
+                                        }
+                                    </AntDesign.Column>
+                                    <AntDesign.Column Title="核稿人" TData="string" Width="100">@(context.Reviewer ==null?"": EditingItem.Reviewer.Name)</AntDesign.Column>
+                                    <AntDesign.Column Title="基础点数" TData="string" Width="100">@(context.BasePoint ==null?"": EditingItem.BasePoint)</AntDesign.Column>
+                                    <AntDesign.Column Title="完成时间" TData="string" Width="100">@(context.FinishedDate.HasValue? EditingItem.FinishedDate.Value.ToString("yyyy-MM-dd"):"")</AntDesign.Column>
+                                    <AntDesign.Column Title="返稿日" TData="string" Width="100">@(context.ReturnDate .HasValue? EditingItem.ReturnDate.Value.ToString("yyyy-MM-dd"):"")</AntDesign.Column>
+                                    <AntDesign.Column Title="客户期限" TData="string" Width="100">@(context.CustomerLimitDate.HasValue? EditingItem.CustomerLimitDate.Value.ToString("yyyy-MM-dd"):"")</AntDesign.Column>
+                                    <AntDesign.Column Title="初稿日" TData="string" Width="100">@(context.FirstDraftDate.HasValue? EditingItem.FirstDraftDate.Value.ToString("yyyy-MM-dd"):"")</AntDesign.Column>
+                                    <AntDesign.Column Title="内部期限" TData="string" Width="100">@(context.InternalDate.HasValue? EditingItem.InternalDate.Value.ToString("yyyy-MM-dd"):"")</AntDesign.Column>
+                                    <AntDesign.Column Title="案件阶段" TData="string" Width="100">@context.CaseStage</AntDesign.Column>
+                                    <AntDesign.Column Title="案件名称" TData="string" @bind-Field="@context.CaseName" Width="250"></AntDesign.Column>
+                                    <AntDesign.Column Title="案件状态" @bind-Field="@context.CaseState" Width="100"></AntDesign.Column>
+                                    <AntDesign.Column Title=" 申请人" @bind-Field="@context.ApplicationName" Width="200"></AntDesign.Column>
+                                    <AntDesign.Column Title="备注" @bind-Field="@context.CaseMemo"></AntDesign.Column>
+
+                                    <ActionColumn Fixed="right" Title="绩效特殊字段填写与操作" Width="350">
+                                        <Space>
+                                            <SpaceItem>
+                                                <Select DataSource="@_Reasons"
+                                                        @bind-Value="@context.AgentFeedbackMemo"
+                                                        LabelName="@nameof(Reason.Name)"
+                                                        ValueName="@nameof(Reason.Value)"
+                                                        Placeholder="请选项一项"
+                                                        DefaultActiveFirstItem="false"
+                                                        EnableSearch="true"
+                                                        AllowClear="true"
+                                                        Style="width:220px;">
+                                                </Select>
+                                            </SpaceItem>
+
+                                            @if ((!context.CaseNo.Contains("CN") || context.CaseNo.Contains("WO")) && context.DoItem == "新申请")
+                                            {
+                                                <SpaceItem>
+                                                    <Button Type="primary" OnClick="()=>OnsubShensu(context)" Style="float:right" Size="small">申诉</Button>
+                                                </SpaceItem>
+                                                <SpaceItem>
+                                                    <AntDesign.DropdownButton OnClick="()=>OnsubShensu(context)" Type="@((ButtonType.Primary, ButtonType.Default))" ButtonsStyle="@("background-color: #1890ff;")">
+                                                        <Overlay>
+                                                            <Menu>
+                                                                @*<MenuItem Key="1" icon="plus" Click="OnsubShensu"></MenuItem>*@
+                                                                <MenuItem Key="2" icon="plus" OnClick="()=>OnJXCal(context)">涉外绩效按字数计算</MenuItem>
+                                                            </Menu>
+                                                        </Overlay>
+                                                    </AntDesign.DropdownButton>
+                                                </SpaceItem>
+                                            }
+                                            else
+                                            {
+                                                <SpaceItem>
+                                                    <Button Type="primary" OnClick="()=>OnsubShensu(context)" Style="float:right" Size="small">申诉</Button>
+                                                </SpaceItem>
+                                            }
+                                        </Space>
+                                    </ActionColumn>
+                                </AntDesign.Table>
+                                }
+                            </Card>
                     </ChildContent>
                 </TabPane>
                 <TabPane Key="2" Tab="历史绩效清单">

wispro.sp.web/Pages/AppCase/MyCaselist.razor.cs

@@ -17,6 +17,43 @@ namespace wispro.sp.web.Pages.AppCase
     [Authorize]
     public partial class MyCaselist
     {
+        class Reason
+        {
+            public string Value { get; set; }
+            public string Name { get; set; }
+        }
+
+        List<Reason> _Reasons = new List<Reason>()
+        {
+            new Reason(){Name="PCT首次英文案",Value="PCT首次英文案"},
+            new Reason(){Name="我方转格式、复核",Value="我方转格式、复核"},
+            new Reason(){Name="台湾案转大陆案",Value="台湾案转大陆案"},
+            new Reason(){Name="大陆案转台湾案",Value="大陆案转台湾案"},
+            new Reason(){Name="同套大陆+台湾",Value="同套大陆+台湾"},
+            new Reason(){Name="不请款",Value="不请款"},
+            new Reason(){Name="撤回后重新递交",Value="撤回后重新递交"},
+            new Reason(){Name="发文后客户取消申请",Value="发文后客户取消申请"},
+            new Reason(){Name="发文后客户原因取消申请，系统结案",Value="发文后客户原因取消申请，系统结案"},
+            new Reason(){Name="改权",Value="改权"},
+            new Reason(){Name="改权+改说明书",Value="改权+改说明书"},
+            new Reason(){Name="客户不进行答辩",Value="客户不进行答辩"},
+            new Reason(){Name="客户提供答辩点，撰写英文报导函",Value="客户提供答辩点，撰写英文报导函"},
+            new Reason(){Name="客户未提供答辩点，撰写英文报导函",Value="客户未提供答辩点，撰写英文报导函辩"},
+            new Reason(){Name="内-外",Value="内-外"},
+            new Reason(){Name="外-内",Value="外-内"},
+            new Reason(){Name="外-内首次申请",Value="外-内首次申请"},
+            new Reason(){Name="请款",Value="请款"},
+            new Reason(){Name="涉外OA不答辩，发报导函结案",Value="涉外OA不答辩，发报导函结案"},
+            new Reason(){Name="涉外实质改权",Value="涉外实质改权"},
+            new Reason(){Name="首次中文案",Value="首次中文案"},
+            new Reason(){Name="我方转格式、复核",Value="我方转格式、复核"},
+            new Reason(){Name="外所/他人首次转入OA",Value="外所/他人首次转入OA"},
+            new Reason(){Name="我方代交",Value="我方代交"},
+            new Reason(){Name="转格式",Value="转格式"},
+            new Reason(){Name="撰写中客户取消申请",Value="撰写中客户取消申请"}
+
+
+        };
         private List<PerformanceItem> _Datas;
         IEnumerable<PerformanceItem> selectedItems;
 
@@ -50,6 +87,7 @@ namespace wispro.sp.web.Pages.AppCase
             }
 
             isFirstInit = false;
+            //StateHasChanged();
         }
 
         private async Task HandleTableChange(QueryModel<PerformanceItem> queryModel)
@@ -58,12 +96,14 @@ namespace wispro.sp.web.Pages.AppCase
 
             var data = await _ItemService.GetItems(queryModel.PageIndex ,queryModel.PageSize);
 
+            _Datas = data.Results;
             _pageIndex = queryModel.PageIndex;
             _pageSize = queryModel.PageSize;
-            _Datas = data.Results;
             _total = data.TotalCount;
             _loading = false;
-            StateHasChanged();
+            //StateHasChanged();
+
+            //_message.Info($"tota:{_total}\r\nPageIndex:{_pageIndex}\r\nPageSize:{_pageSize}");
         }
 
         private void OnsubShensu(PerformanceItem Item)

wispro.sp.web/Properties/launchSettings.json

@@ -17,15 +17,6 @@
       "nativeDebugging": false,
       "jsWebView2Debugging": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}"
-    },
-    "wispro.sp.webclient": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
-      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}"
     }
   }
 }