zhupei 3 lat temu
rodzic
commit
c8fa05b24a

+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WorkOrderReportController.cs

1984
             }
1984
             }
1985
             if (isExport)
1985
             if (isExport)
1986
             {
1986
             {
1987
-                var cols = new string[] { "名称", "受理数量", "处理量", "延期量", "重办量", "结案量", "办理率", "办结率" };
1987
+                var cols = new string[] { "名称", "受理数量", "处理量", "延期量", "重办量", "结案量","催办量", "办理率", "办结率" };
1988
                 new NPOIHelper().ExportToExcel($"工单报表{sdate}-{edate}", obj.Tables[0], cols);
1988
                 new NPOIHelper().ExportToExcel($"工单报表{sdate}-{edate}", obj.Tables[0], cols);
1989
                 return Success("导出excel");
1989
                 return Success("导出excel");
1990
             }
1990
             }

+ 10 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

1983
 
1983
 
1984
             DataTable dt = new DataTable();
1984
             DataTable dt = new DataTable();
1985
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
1985
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
1986
-
1986
+            //int userId = 689;
1987
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
1987
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
1988
 
1988
 
1989
             string sql = " and F_IsDelete=0";
1989
             string sql = " and F_IsDelete=0";
2593
                     }
2593
                     }
2594
                     else if (Int32.Parse(strtab) == 13)
2594
                     else if (Int32.Parse(strtab) == 13)
2595
                     {//工单催办
2595
                     {//工单催办
2596
-                        btns.Add(ButtonGroup.Reminder());
2596
+                        if (userModel.F_RoleCode.ToUpper() == "DDZG" || userModel.F_RoleCode.ToUpper() == "GLY")
2597
+                        {
2598
+                            btns.Add(ButtonGroup.Reminder());
2599
+                        }
2600
+                        else
2601
+                        {
2602
+                            btns = ButtonGroup.GetButtons(dr["F_WorkState"].ToString(), userModel.F_RoleCode.ToUpper(), dr["F_IsResult"].ToString(), iszbdw, ispd);
2603
+                            btns.Add(ButtonGroup.Reminder());
2604
+                        }
2597
                     }
2605
                     }
2598
                     btns.Add(ButtonGroup.query());
2606
                     btns.Add(ButtonGroup.query());
2599
                 }
2607
                 }

+ 4 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

276
                     {
276
                     {
277
                        // buttons.Add(approval());
277
                        // buttons.Add(approval());
278
                         buttons.Add(takeback());
278
                         buttons.Add(takeback());
279
+                        buttons.Add(Reminder());
279
                    //     buttons.Add(turnsee()); //buttons.Add(oversee());
280
                    //     buttons.Add(turnsee()); //buttons.Add(oversee());
280
                    //     buttons.Add(supervision());
281
                    //     buttons.Add(supervision());
281
                     }
282
                     }
324
                     {
325
                     {
325
                       //  buttons.Add(approval());
326
                       //  buttons.Add(approval());
326
                         buttons.Add(takeback());
327
                         buttons.Add(takeback());
327
-                     //   buttons.Add(turnsee()); //buttons.Add(oversee());
328
-                     //   buttons.Add(supervision());
328
+                        buttons.Add(Reminder());
329
+                        //   buttons.Add(turnsee()); //buttons.Add(oversee());
330
+                        //   buttons.Add(supervision());
329
                     }
331
                     }
330
                     //质检专员
332
                     //质检专员
331
                    // if (code == "ZJZY")
333
                    // if (code == "ZJZY")