前端代码提交

web/YTSoft.BaseCallCenter.MVCWeb/Content/js/CallRecord/callworkflow.js

@@ -114,7 +114,6 @@ layui.use(['form', 'upload', 'layer', 'jquery', 'laydate'], function () {
         }
         
         //来电号码
-        dataArr["F_CUSTOMERTELEPHONE"] = $("#F_TelephoneWB").val();
         dataArr["F_REPAIRMANID"] = helper.cookies.get('F_REPAIRMANID');
     }else{
       //来电号码
@@ -244,6 +243,10 @@ layui.use(['form', 'upload', 'layer', 'jquery', 'laydate'], function () {
     //所有表单数据
     var dataArr = new Array();
     dataArr = data.field;
+    console.log(data.F_REPAIRMANID)
+    if (data.F_REPAIRMANID == 3) {
+      helper.cookies.set('F_REPAIRMANID', "")
+    }
     if(helper.cookies.get('F_REPAIRMANID')=="4"){
       debugger
       if($("#F_CustomerEName").val()==""){
@@ -256,6 +259,7 @@ layui.use(['form', 'upload', 'layer', 'jquery', 'laydate'], function () {
       dataArr["F_REPAIRMANID"] = helper.cookies.get('F_REPAIRMANID');
       console.log(helper.cookies.get('F_REPAIRMANID'))
     }
+    
     var zbbm = $("#F_DEPTID").find("option:selected").val();
     var zbry = $("#F_CREATEBY").find("option:selected").val();
     dataArr["F_WORKORDERSTATEID"] = 0;

web/YTSoft.BaseCallCenter.MVCWeb/Content/js/WorkOrder/workordernolist.js

@@ -43,7 +43,7 @@ layui.use(['table', 'jquery'], function () {
                 //console.log(data.F_REPAIRMANID)
             //}
             console.log(helper.cookies.get('F_REPAIRMANID'))
-            if (data.F_REPAIRMANID == 1) {
+            if (data.F_REPAIRMANID == 1 ||data.F_REPAIRMANID == 3)  {
                 helper.cookies.set('F_REPAIRMANID', "")
             }
             console.log(data.F_REPAIRMANID)

web/YTSoft.BaseCallCenter.MVCWeb/Views/CallRecord/CallWorkFolw.cshtml

@@ -81,7 +81,7 @@
 
                         <div class="layui-col-md4">
                             <label class="layui-form-label">来电电话</label>
-                            <div class="layui-input-block dhDiv" style="display: none;">
+                            <div class="layui-input-block">
 
                                 <span class="layui-form-label labelcontent">
                                     @if (!string.IsNullOrEmpty(Model.WorkOrderBaseModel.F_CUSTOMERTELEPHONE))
@@ -92,9 +92,7 @@
                                 </span>
                                 
                             </div>
-                            <div class="layui-input-block wbDiv" style="display: none;">
-                                <input id="F_TelephoneWB" name="F_Telephone" value="" autocomplete="off" placeholder="" class="layui-input" type="text" />
-                            </div>
+                            
                         </div>
                         <div class="layui-col-md4">
                             <label class="layui-form-label">回复电话</label>
@@ -160,6 +158,34 @@
                             </div>
                         </div>
 
+                        <div class="layui-col-md4">
+
+                            @if (@Model.WorkOrderBaseModel.F_REPAIRMANID == 3)
+                            {
+                                <label class="layui-form-label">微信号</label>
+                                <div class="layui-input-block">
+                                    <span id="F_CustomerEName" class="layui-form-label" style="text-align:left">@Model.WorkOrderBaseModel.F_EMPCODE</span>
+                                </div>
+                            }
+                            else if (@Model.WorkOrderBaseModel.F_REPAIRMANID == 4)
+                            {
+                                <label class="layui-form-label">微博号</label>
+                                <div class="layui-input-block">
+                                    <input id="F_CustomerEName" disabled value="@Model.WorkOrderBaseModel.F_EMPCODE"
+                                                autocomplete="off" placeholder="" class="layui-input" type="text" />
+                                </div>
+                            }
+                            else
+                            {
+                                <label class="layui-form-label">微博号</label>
+                                <div class="layui-input-block">
+                                    <input id="F_CustomerEName" value="@Model.WorkOrderBaseModel.CustomerBaseModel.F_CustomerEName"
+                                                autocomplete="off" placeholder="" class="layui-input" type="text" />
+                                        
+                                </div> 
+                            }
+                        </div>
+
                     </li>
                     <li class="layui-row layui-col-space5">
 
@@ -183,14 +209,7 @@
                             </div>
                         </div>
 
-                        <div class="layui-col-md4 F_CustomerEName" style="display: none;"> 
-                            <label class="layui-form-label">微博号</label>
-                            <div class="layui-input-block">
-                                <input id="F_CustomerEName" value="@Model.WorkOrderBaseModel.CustomerBaseModel.F_CustomerEName"
-                                            autocomplete="off" placeholder="" class="layui-input" type="text" />
-                                    
-                            </div> 
-                        </div>
+                        
                     </li>
                 </ul>
             </div>

web/YTSoft.BaseCallCenter.MVCWeb/Views/Customer/CusOrderList.cshtml

@@ -108,7 +108,7 @@
 <script src="/Content/js/WorkOrder/workorderalllist.js" charset="utf-8"></script>
 
 <script type="text/html" id="btnCallOut">
-    {{#  if(d.F_CUSTOMERTELEPHONE === ''){ }}
+    {{#  if(d.F_CUSTOMERTELEPHONE === ''||d.F_CUSTOMERTELEPHONE == null){ }}
 
     {{#  } else { }}
     <i class="fa fa-phone-square" style="color:green; cursor:pointer;" onclick="top.PhoneCallOut(1, '{{d.F_CUSTOMERTELEPHONE}}');" title="拨打{{d.F_CUSTOMERTELEPHONE }}"></i>&nbsp;&nbsp;&nbsp;{{d.F_CUSTOMERTELEPHONE }}

web/YTSoft.BaseCallCenter.MVCWeb/Views/Order/OverOrderView.cshtml

@@ -281,7 +281,7 @@
 </script>
 <script src="/Content/js/WorkOrder/OverOrderView.js" charset="utf-8"></script>
 <script type="text/html" id="btnCallOut">
-    {{#  if(d.F_CUSTOMERTELEPHONE === ''){ }}
+    {{#  if(d.F_CUSTOMERTELEPHONE === ''||d.F_CUSTOMERTELEPHONE == null){ }}
 
     {{#  } else { }}
     <i class="fa fa-phone-square" style="color:green; cursor:pointer;" onclick="top.PhoneCallOut(1, '{{d.F_CUSTOMERTELEPHONE}}');" title="拨打{{d.F_CUSTOMERTELEPHONE }}"></i>&nbsp;&nbsp;&nbsp;{{d.F_CUSTOMERTELEPHONE }}

web/YTSoft.BaseCallCenter.MVCWeb/Views/Order/ViewMyOrder.cshtml

@@ -91,6 +91,30 @@
                 class="layui-form-label  labelcontent">@Model.WorkOrderBaseModel.CustomerBaseModel.F_CustomerCode</span>
 
             </div>
+            @if (@Model.WorkOrderBaseModel.F_REPAIRMANID == 3)
+              {
+                  <label class="layui-form-label">微信号</label>
+                  <div class="layui-input-block">
+                      <span id="F_CustomerEName" class="layui-form-label" style="text-align:left">@Model.WorkOrderBaseModel.F_EMPCODE</span>
+                  </div>
+              }
+              else if (@Model.WorkOrderBaseModel.F_REPAIRMANID == 4)
+              {
+                  <label class="layui-form-label">微博号</label>
+                  <div class="layui-input-block">
+                      <input id="F_CustomerEName" disabled value="@Model.WorkOrderBaseModel.F_EMPCODE"
+                                  autocomplete="off" placeholder="" class="layui-input" type="text" />
+                  </div>
+              }
+              else
+              {
+                  <label class="layui-form-label">微博号</label>
+                  <div class="layui-input-block">
+                      <input id="F_CustomerEName" value="@Model.WorkOrderBaseModel.CustomerBaseModel.F_CustomerEName"
+                                  autocomplete="off" placeholder="" class="layui-input" type="text" />
+                          
+                  </div> 
+              }
 
           </li>
           <li class="layui-row layui-col-space5">

web/YTSoft.BaseCallCenter.MVCWeb/Views/Order/WorkOrderAllList.cshtml

@@ -300,7 +300,7 @@
 </script>
 <script src="/Content/js/WorkOrder/workorderalllist.js" charset="utf-8"></script>
 <script type="text/html" id="btnCallOut">
-    {{#  if(d.F_CUSTOMERTELEPHONE === ''){ }}
+    {{#  if(d.F_CUSTOMERTELEPHONE === ''||d.F_CUSTOMERTELEPHONE == null){ }}
 
     {{#  } else { }}
     <i class="fa fa-phone-square" style="color:green; cursor:pointer;" onclick="top.PhoneCallOut(1, '{{d.F_CUSTOMERTELEPHONE}}');" title="拨打{{d.F_CUSTOMERTELEPHONE }}"></i>&nbsp;&nbsp;&nbsp;{{d.F_CUSTOMERTELEPHONE }}

web/YTSoft.BaseCallCenter.MVCWeb/Views/Order/WorkOrderMyDataOverAnswer.cshtml

@@ -230,7 +230,7 @@
 </script>
 <script src="/Content/js/WorkOrder/workorderalllist.js" charset="utf-8"></script>
 <script type="text/html" id="btnCallOut">
-    {{#  if(d.F_CUSTOMERTELEPHONE === ''){ }}
+    {{#  if(d.F_CUSTOMERTELEPHONE === ''||d.F_CUSTOMERTELEPHONE == null){ }}
 
     {{#  } else { }}
     <i class="fa fa-phone-square" style="color:green; cursor:pointer;" onclick="top.PhoneCallOut(1, '{{d.F_CUSTOMERTELEPHONE}}');" title="拨打{{d.F_CUSTOMERTELEPHONE }}"></i>&nbsp;&nbsp;&nbsp;{{d.F_CUSTOMERTELEPHONE }}

web/YTSoft.BaseCallCenter.MVCWeb/Views/Order/WorkOrderMyList.cshtml

@@ -217,7 +217,7 @@
 <script src="/Content/js/WorkOrder/workordermylist.js"></script>
 <script src="/Content/layui/formatdate.js"></script>
 <script type="text/html" id="btnCallOut">
-    {{#  if(d.F_CUSTOMERTELEPHONE === ''){ }}
+    {{#  if(d.F_CUSTOMERTELEPHONE === ''||d.F_CUSTOMERTELEPHONE == null){ }}
 
     {{#  } else { }}
     <i class="fa fa-phone-square" style="color:green; cursor:pointer;" onclick="top.PhoneCallOut(1, '{{d.F_CUSTOMERTELEPHONE}}');" title="拨打{{d.F_CUSTOMERTELEPHONE }}"></i>&nbsp;&nbsp;&nbsp;{{d.F_CUSTOMERTELEPHONE }}

web/YTSoft.BaseCallCenter.MVCWeb/Views/Order/WorkOrderMyListDZ.cshtml

@@ -202,7 +202,7 @@
 <script src="/Content/js/WorkOrder/WorkOrderMyListHF.js"></script>
 <script src="/Content/layui/formatdate.js"></script>
 <script type="text/html" id="btnCallOut">
-    {{#  if(d.F_CUSTOMERTELEPHONE === ''){ }}
+    {{#  if(d.F_CUSTOMERTELEPHONE === ''||d.F_CUSTOMERTELEPHONE == null){ }}
 
     {{#  } else { }}
     <i class="fa fa-phone-square" style="color:green; cursor:pointer;" onclick="top.PhoneCallOut(1, '{{d.F_CUSTOMERTELEPHONE}}');" title="拨打{{d.F_CUSTOMERTELEPHONE }}"></i>&nbsp;&nbsp;&nbsp;{{d.F_CUSTOMERTELEPHONE }}

web/YTSoft.BaseCallCenter.MVCWeb/Views/Order/WorkOrderMyListDZ1.cshtml

@@ -219,7 +219,7 @@
 <script src="/Content/layui/formatdate.js"></script>
 <script type="text/html" id="btnCallOut">
 
-    {{#  if(d.F_CUSTOMERTELEPHONE === ''){ }}
+    {{#  if(d.F_CUSTOMERTELEPHONE === ''||d.F_CUSTOMERTELEPHONE == null){ }}
 
     {{#  } else { }}
     <i class="fa fa-phone-square" style="color:green; cursor:pointer;" onclick="top.PhoneCallOut(1, '{{d.F_CUSTOMERTELEPHONE}}');" title="拨打{{d.F_CUSTOMERTELEPHONE }}"></i>&nbsp;&nbsp;&nbsp;{{d.F_CUSTOMERTELEPHONE }}

web/YTSoft.BaseCallCenter.MVCWeb/Views/Order/WorkOrderMyListHF.cshtml

@@ -222,7 +222,7 @@
 <script src="/Content/js/WorkOrder/WorkOrderMyListHF.js"></script>
 <script src="/Content/layui/formatdate.js"></script>
 <script type="text/html" id="btnCallOut">
-    {{#  if(d.F_CUSTOMERTELEPHONE === ''){ }}
+    {{#  if(d.F_CUSTOMERTELEPHONE === ''||d.F_CUSTOMERTELEPHONE == null){ }}
 
     {{#  } else { }}
     <i class="fa fa-phone-square" style="color:green; cursor:pointer;" onclick="top.PhoneCallOut(1, '{{d.F_CUSTOMERTELEPHONE}}');" title="拨打{{d.F_CUSTOMERTELEPHONE }}"></i>&nbsp;&nbsp;&nbsp;{{d.F_CUSTOMERTELEPHONE }}

web/YTSoft.BaseCallCenter.MVCWeb/Views/Order/WorkOrderMyListJY.cshtml

@@ -227,7 +227,7 @@
 </script>
 <script src="/Content/js/WorkOrder/WorkOrderMyListJY.js" charset="utf-8"></script>
 <script type="text/html" id="btnCallOut">
-    {{#  if(d.F_CUSTOMERTELEPHONE === ''){ }}
+    {{#  if(d.F_CUSTOMERTELEPHONE === ''||d.F_CUSTOMERTELEPHONE == null){ }}
 
     {{#  } else { }}
     <i class="fa fa-phone-square" style="color:green; cursor:pointer;" onclick="top.PhoneCallOut(1, '{{d.F_CUSTOMERTELEPHONE}}');" title="拨打{{d.F_CUSTOMERTELEPHONE }}"></i>&nbsp;&nbsp;&nbsp;{{d.F_CUSTOMERTELEPHONE }}

web/YTSoft.BaseCallCenter.MVCWeb/Views/Order/WorkOrderMyListNotice.cshtml

@@ -222,7 +222,7 @@
 <script src="/Content/js/WorkOrder/WorkOrderMyListHF.js"></script>
 <script src="/Content/layui/formatdate.js"></script>
 <script type="text/html" id="btnCallOut">
-    {{#  if(d.F_CUSTOMERTELEPHONE === ''){ }}
+    {{#  if(d.F_CUSTOMERTELEPHONE === ''||d.F_CUSTOMERTELEPHONE == null){ }}
 
     {{#  } else { }}
     <i class="fa fa-phone-square" style="color:green; cursor:pointer;" onclick="top.PhoneCallOut(1, '{{d.F_CUSTOMERTELEPHONE}}');" title="拨打{{d.F_CUSTOMERTELEPHONE }}"></i>&nbsp;&nbsp;&nbsp;{{d.F_CUSTOMERTELEPHONE }}

web/YTSoft.BaseCallCenter.MVCWeb/Views/Order/workorderWaitlist.cshtml

@@ -222,7 +222,7 @@
 <script src="/Content/js/WorkOrder/workorderWaitlist.js"></script>
 <script src="/Content/layui/formatdate.js"></script>
 <script type="text/html" id="btnCallOut">
-    {{#  if(d.F_CUSTOMERTELEPHONE === ''){ }}
+    {{#  if(d.F_CUSTOMERTELEPHONE === ''||d.F_CUSTOMERTELEPHONE == null){ }}
 
     {{#  } else { }}
     <i class="fa fa-phone-square" style="color:green; cursor:pointer;" onclick="top.PhoneCallOut(1, '{{d.F_CUSTOMERTELEPHONE}}');" title="拨打{{d.F_CUSTOMERTELEPHONE }}"></i>&nbsp;&nbsp;&nbsp;{{d.F_CUSTOMERTELEPHONE }}

web/YTSoft.BaseCallCenter.MVCWeb/Views/SystemManage/DepartmentList.cshtml

@@ -78,6 +78,7 @@
 
     <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
     <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="delete">删除</a>
+    
 </script>
 
 <script type="text/javascript" src="/Content/layui/layui.js" charset="utf-8"></script>

web/YTSoft.BaseCallCenter.MVCWeb/Views/WorkOrder/WorkOrderAllList.cshtml

@@ -283,7 +283,7 @@
 </script>
 <script src="/Content/js/WorkOrder/workorderalllist.js" charset="utf-8"></script>
 <script type="text/html" id="btnCallOut">
-    {{#  if(d.F_CUSTOMERTELEPHONE === ''){ }}
+    {{#  if(d.F_CUSTOMERTELEPHONE === ''||d.F_CUSTOMERTELEPHONE == null){ }}
 
     {{#  } else { }}
     <i class="fa fa-phone-square" style="color:green; cursor:pointer;" onclick="top.PhoneCallOut(1, '{{d.F_CUSTOMERTELEPHONE}}');" title="拨打{{d.F_CUSTOMERTELEPHONE }}"></i>&nbsp;&nbsp;&nbsp;{{d.F_CUSTOMERTELEPHONE }}

web/YTSoft.BaseCallCenter.MVCWeb/Views/WorkOrder/WorkOrderAllListReport.cshtml

@@ -194,7 +194,7 @@
 <script src="/Content/js/WorkOrder/WorkOrderAllListReport.js" charset="utf-8"></script>
 <script src="/Content/layui/formatdate.js"></script>
 <script type="text/html" id="btnCallOut">
-    {{#  if(d.F_CUSTOMERTELEPHONE === ''){ }}
+    {{#  if(d.F_CUSTOMERTELEPHONE === ''||d.F_CUSTOMERTELEPHONE == null){ }}
 
     {{#  } else { }}
     <i class="fa fa-phone-square" style="color:green; cursor:pointer;" onclick="top.PhoneCallOut(1, '{{d.F_CUSTOMERTELEPHONE}}');" title="拨打{{d.F_CUSTOMERTELEPHONE }}"></i>&nbsp;&nbsp;&nbsp;{{d.F_CUSTOMERTELEPHONE }}

web/YTSoft.BaseCallCenter.MVCWeb/Views/WorkOrder/WorkOrderAllList_Wb.cshtml

@@ -151,7 +151,7 @@
 </script>  
 <script src="/Content/js/WorkOrder/WorkOrderAllList_Wb.js"></script> 
 <script type="text/html" id="btnCallOut">
-    {{#  if(d.F_CUSTOMERTELEPHONE === ''){ }}
+    {{#  if(d.F_CUSTOMERTELEPHONE === ''||d.F_CUSTOMERTELEPHONE == null){ }}
 
     {{#  } else { }}
     <i class="fa fa-phone-square" style="color:green; cursor:pointer;" onclick="top.PhoneCallOut(1, '{{d.F_CUSTOMERTELEPHONE}}');" title="拨打{{d.F_CUSTOMERTELEPHONE }}"></i>&nbsp;&nbsp;&nbsp;{{d.F_CUSTOMERTELEPHONE }}

web/YTSoft.BaseCallCenter.MVCWeb/Views/WorkOrder/WorkOrderMyList.cshtml

@@ -217,7 +217,7 @@
 <script src="/Content/js/WorkOrder/workordermylist.js"></script>
 <script src="/Content/layui/formatdate.js"></script>
 <script type="text/html" id="btnCallOut">
-    {{#  if(d.F_CUSTOMERTELEPHONE === ''){ }}
+    {{#  if(d.F_CUSTOMERTELEPHONE === ''||d.F_CUSTOMERTELEPHONE == null){ }}
 
     {{#  } else { }}
     <i class="fa fa-phone-square" style="color:green; cursor:pointer;" onclick="top.PhoneCallOut(1, '{{d.F_CUSTOMERTELEPHONE}}');" title="拨打{{d.F_CUSTOMERTELEPHONE }}"></i>&nbsp;&nbsp;&nbsp;{{d.F_CUSTOMERTELEPHONE }}

web/YTSoft.BaseCallCenter.MVCWeb/Views/WorkOrder/WorkOrderMyListDZ.cshtml

@@ -222,7 +222,7 @@
 <script src="/Content/js/WorkOrder/WorkOrderMyListHF.js"></script>
 <script src="/Content/layui/formatdate.js"></script>
 <script type="text/html" id="btnCallOut">
-    {{#  if(d.F_CUSTOMERTELEPHONE === ''){ }}
+    {{#  if(d.F_CUSTOMERTELEPHONE === ''||d.F_CUSTOMERTELEPHONE == null){ }}
 
     {{#  } else { }}
     <i class="fa fa-phone-square" style="color:green; cursor:pointer;" onclick="top.PhoneCallOut(1, '{{d.F_CUSTOMERTELEPHONE}}');" title="拨打{{d.F_CUSTOMERTELEPHONE }}"></i>&nbsp;&nbsp;&nbsp;{{d.F_CUSTOMERTELEPHONE }}

web/YTSoft.BaseCallCenter.MVCWeb/Views/WorkOrder/WorkOrderMyListHF.cshtml

@@ -222,7 +222,7 @@
 <script src="/Content/js/WorkOrder/WorkOrderMyListHF.js"></script>
 <script src="/Content/layui/formatdate.js"></script>
 <script type="text/html" id="btnCallOut">
-    {{#  if(d.F_CUSTOMERTELEPHONE === ''){ }}
+    {{#  if(d.F_CUSTOMERTELEPHONE === ''||d.F_CUSTOMERTELEPHONE == null){ }}
 
     {{#  } else { }}
     <i class="fa fa-phone-square" style="color:green; cursor:pointer;" onclick="top.PhoneCallOut(1, '{{d.F_CUSTOMERTELEPHONE}}');" title="拨打{{d.F_CUSTOMERTELEPHONE }}"></i>&nbsp;&nbsp;&nbsp;{{d.F_CUSTOMERTELEPHONE }}

web/YTSoft.BaseCallCenter.MVCWeb/Views/WorkOrder/WorkOrderNoList.cshtml

@@ -149,7 +149,7 @@
 </script>
 <script src="/Content/js/WorkOrder/workordernolist.js"></script>
 <script type="text/html" id="btnCallOut">
-    {{#  if(d.F_CUSTOMERTELEPHONE === ''){ }}
+    {{#  if(d.F_CUSTOMERTELEPHONE === ''||d.F_CUSTOMERTELEPHONE == null){ }}
 
     {{#  } else { }}
     <i class="fa fa-phone-square" style="color:green; cursor:pointer;" onclick="top.PhoneCallOut(1, '{{d.F_CUSTOMERTELEPHONE}}');" title="拨打{{d.F_CUSTOMERTELEPHONE }}"></i>&nbsp;&nbsp;&nbsp;{{d.F_CUSTOMERTELEPHONE }}

web/YTSoft.BaseCallCenter.MVCWeb/Views/WorkOrder/workorderWaitlist.cshtml

@@ -222,7 +222,7 @@
 <script src="/Content/js/WorkOrder/workorderWaitlist.js"></script>
 <script src="/Content/layui/formatdate.js"></script>
 <script type="text/html" id="btnCallOut">
-    {{#  if(d.F_CUSTOMERTELEPHONE === ''){ }}
+    {{#  if(d.F_CUSTOMERTELEPHONE === ''||d.F_CUSTOMERTELEPHONE == null){ }}
 
     {{#  } else { }}
     <i class="fa fa-phone-square" style="color:green; cursor:pointer;" onclick="top.PhoneCallOut(1, '{{d.F_CUSTOMERTELEPHONE}}');" title="拨打{{d.F_CUSTOMERTELEPHONE }}"></i>&nbsp;&nbsp;&nbsp;{{d.F_CUSTOMERTELEPHONE }}