telephone-clients 4.0.0-1-81 → 4.0.0-1-83

package/src/filiale/meihekou/pc/WorkListAllNew.vue

@@ -406,8 +406,7 @@
             </td>
             <td style="text-align: center;" :style="row.f_overdue_show  == '已逾期'?'color:#FF5744':row.defname == '话务员派单'? 'color:#FF9900':''">
               <nobr>
-                <!--                row.defname ?row.defname: (row.f_state === '撤销' ? '撤销' : '完成')-->
-                {{ row.f_state ?row.f_state:(row.defname ?row.defname:'完成')}}
+                {{ row.defname ? row.defname : (row.f_state ?row.f_state:'完成')}}
               </nobr>
             </td>
             <td  style="text-align: center;" :style="row.f_overdue_show  == '已逾期'?'color:#FF5744':row.defname == '话务员派单'? 'color:#FF9900':''">
@@ -748,12 +747,12 @@ export default {
           this.model.overday = ` and  overday  <= 604800  and overday  > 0 and (f_state != '撤销' or f_state is null)`
         }
       }
-      if(args.model.f_result_status === '未完成'){
-        args.condition += ` and  tsw.f_result_status is null`
-      }
-      if(args.model.f_result_status === '已完成'){
-        args.condition += ` and  tsw.f_result_status = '已完成'`
-      }
+      // if(args.model.f_result_status === '未完成'){
+      //   args.condition += ` and  tsw.f_result_status is null`
+      // }
+      // if(args.model.f_result_status === '已完成'){
+      //   args.condition += ` and  tsw.f_result_status = '已完成'`
+      // }
       if(args.model.f_revisit == '是'){
           args.condition += `  and f_revisit = '是'`
       }

package/src/filiale/meihekou/telephoneAndroid.js

@@ -1,26 +1,26 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//pc和手机端重写组件较多的话 建议将cp和android分到两个文件中
-let specialComp = {
-  //  其他收费
-  'other_charge': (resolve) => { require(['./android/Othercharge'], resolve) },
-  'completed-repair': (resolve) => { require(['./android/CompletedRepair'], resolve) },
-  'repair-first': (resolve) => { require(['./android/RepairFirstV'], resolve) },
-  //  支付二维码
-  'create_qrcode': (resolve) => { require(['./android/createQRcode'], resolve) },
-  //  在线缴费
-  'online_buy_gas': (resolve) => { require(['./android/onlineBuyGas'], resolve) },
-  'add-my-task': (resolve) => { require(['./android/AddMyTask'], resolve) },
-  'phone-stand-work': (resolve) => { require(['./android/PhoneStandWork'], resolve) },
-  'repair-orderV': (resolve) => { require(['./android/RepairOrderV'], resolve) },
-  'fault-all': (resolve) => { require(['./android/FaultAll'], resolve) },
-  'service-online-query': (resolve) => { require(['./android/ServiceOnlineQuery'], resolve) },
-  'app-work-history': (resolve) => { require(['./android/AppWorkHistory'], resolve) },
-  'phone-stand-work-new': (resolve) => { require(['./android/PhoneStandWorkNew'], resolve) },
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//pc和手机端重写组件较多的话 建议将cp和android分到两个文件中
+let specialComp = {
+  //  其他收费
+  'other_charge': (resolve) => { require(['./android/Othercharge'], resolve) },
+  'completed-repair': (resolve) => { require(['./android/CompletedRepair'], resolve) },
+  'repair-first': (resolve) => { require(['./android/RepairFirstV'], resolve) },
+  //  支付二维码
+  'create_qrcode': (resolve) => { require(['./android/createQRcode'], resolve) },
+  //  在线缴费
+  'online_buy_gas': (resolve) => { require(['./android/onlineBuyGas'], resolve) },
+  'add-my-task': (resolve) => { require(['./android/AddMyTask'], resolve) },
+  'phone-stand-work': (resolve) => { require(['./android/PhoneStandWork'], resolve) },
+  'repair-orderV': (resolve) => { require(['./android/RepairOrderV'], resolve) },
+  'fault-all': (resolve) => { require(['./android/FaultAll'], resolve) },
+  'service-online-query': (resolve) => { require(['./android/ServiceOnlineQuery'], resolve) },
+  'app-work-history': (resolve) => { require(['./android/AppWorkHistory'], resolve) },
+  'phone-stand-work-new': (resolve) => { require(['./android/PhoneStandWorkNew'], resolve) },
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/xinjiangdexin/telephone.js

@@ -1,16 +1,16 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//pc和手机分别注册到两个文件中
-let specialComp = {
-  // 工单详情子组件
-  'materials': (resolve) => { require(['./pc/Materials'], resolve) },
-  'work-listall-new': (resolve) => { require(['./pc/WorkListAllNew'], resolve) },
-  'text-service': (resolve) => { require(['./pc/TextService'], resolve) }
-
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//pc和手机分别注册到两个文件中
+let specialComp = {
+  // 工单详情子组件
+  'materials': (resolve) => { require(['./pc/Materials'], resolve) },
+  'work-listall-new': (resolve) => { require(['./pc/WorkListAllNew'], resolve) },
+  'text-service': (resolve) => { require(['./pc/TextService'], resolve) }
+
+}
+exports.specialComp = specialComp
+
+
+
+