Kaynağa Gözat

新增办理中调度也可以将其收回

zhoufan 8 yıl önce
ebeveyn
işleme
a05fabc7cb

+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

4524
 
4524
 
4525
                 if (modelT_Bus_WorkOrder != null && modelT_Bus_AssignedInfo != null)
4525
                 if (modelT_Bus_WorkOrder != null && modelT_Bus_AssignedInfo != null)
4526
                 {
4526
                 {
4527
-                    if (modelT_Bus_AssignedInfo.F_IsSure == 0)
4527
+                    if (modelT_Bus_AssignedInfo.F_IsSure == 0 || (modelT_Bus_AssignedInfo.F_IsSure == 1 && modelT_Bus_WorkOrder.F_WorkState == 4))
4528
                     {
4528
                     {
4529
                         using (TransactionScope trans = new TransactionScope())
4529
                         using (TransactionScope trans = new TransactionScope())
4530
                         {
4530
                         {

+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

160
                     }
160
                     }
161
                     if (code == "ZXLD" || code == "ZXLDGLY" || code == "GLY")
161
                     if (code == "ZXLD" || code == "ZXLDGLY" || code == "GLY")
162
                     {
162
                     {
163
-                        buttons.Add(oversee()); buttons.Add(supervision());
163
+                        buttons.Add(takeback()); buttons.Add(oversee()); buttons.Add(supervision());
164
                     }
164
                     }
165
                     break;
165
                     break;
166
                 case "5":
166
                 case "5":