修复

RMYY_CallCenter_Api/Controllers/DictionaryType/GongDanTypeController.cs

@@ -52,6 +52,7 @@ namespace RMYY_CallCenter_Api.Controllers
                 treeModel.text = item.F_Name;
                 treeModel.parentid = item.F_ParentID.ToString();
                 treeModel.TypeId = item.F_TypeId;//工单级别类型
+                
                 treelist.Add(treeModel);
             }
             if (flag != 0)
@@ -149,8 +150,8 @@ namespace RMYY_CallCenter_Api.Controllers
                 foreach (string str in ids)
                 {                    
                     var model = gongdanBll.GetModel(Convert.ToInt32(str));
-                    if(model.F_TypeId==1 || model.F_TypeId==2)
-                        return Error("不能删除一级二级工单类型！");
+                    if(model.F_TypeId==1 )
+                        return Error("不能删除一级工单类型！");
                     idd += str + ",";
                 }
                 #region 判断子栏目是否存在

RMYY_CallCenter_Api/Controllers/SchedulingController.cs

@@ -437,7 +437,7 @@ namespace RMYY_CallCenter_Api.Controllers
             }
             if (model.F_WorkOrderState == (int)EnumSchedullingWorkOrderState.receive)
             {
-                model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.neworder;
+                model.F_WorkOrderState = (int)EnumSchedullingWorkOrderState.neworder;
                 model.F_DealDept = "";
                 model.F_DealMan = "";
                 model.F_Deadline = null;
@@ -596,7 +596,7 @@ namespace RMYY_CallCenter_Api.Controllers
                 {                 
                     model.F_UpdateTime = DateTime.Now;                   
 
-                    model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.dealing;
+                    model.F_WorkOrderState = (int)EnumSchedullingWorkOrderState.dealing;
                     baseBll.Update(model);
                     AddOperatorLog("查收了工单", (int)EnumOperatorType.check, model.F_WorkOrderCode);
 
@@ -618,7 +618,7 @@ namespace RMYY_CallCenter_Api.Controllers
             {
                 if (model.F_DealMan == User.F_UserCode)
                 {
-                    model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.neworder;
+                    model.F_WorkOrderState = (int)EnumSchedullingWorkOrderState.neworder;
                     model.F_DealMan = "";
                     model.F_DealDept = "";
                     model.F_AssignTime = null;
@@ -800,7 +800,7 @@ namespace RMYY_CallCenter_Api.Controllers
             }
             if (model.F_WorkOrderState == 0)
             {
-                model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.waitsubmit;
+                model.F_WorkOrderState = (int)EnumSchedullingWorkOrderState.waitsubmit;
                 baseBll.Update(model);
                 AddOperatorLog(User.F_UserName + "撤回了工单", (int)EnumOperatorType.myretract, model.F_WorkOrderCode);
                 return Success("撤回操作成功");
@@ -837,7 +837,7 @@ namespace RMYY_CallCenter_Api.Controllers
                     BLL.T_IntegratedScheduling_Evaluate evabll = new BLL.T_IntegratedScheduling_Evaluate();
                     if (evabll.Add(evamodel) > 0)
                     {
-                        model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.finish;
+                        model.F_WorkOrderState = (int)EnumSchedullingWorkOrderState.finish;
                         model.F_UpdateTime = DateTime.Now;
                         //评价=自动确认耗材
                        // model.F_ConfirmEquip = 2;
@@ -900,7 +900,7 @@ namespace RMYY_CallCenter_Api.Controllers
                         BLL.T_IntegratedScheduling_Evaluate evabll = new BLL.T_IntegratedScheduling_Evaluate();
                         if (evabll.Add(evamodel) > 0)
                         {
-                            model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.finish;
+                            model.F_WorkOrderState = (int)EnumSchedullingWorkOrderState.finish;
                             model.F_UpdateTime = DateTime.Now;
                             model.F_Score = 15;
                             baseBll.Update(model);