system-clients 3.2.55-furuike → 3.2.56-furuike

package/src/filiale/furuike/Main.vue

@@ -398,30 +398,26 @@ export default {
         })
       }
     },
-    async workorderOverRemind(){
-      var   f_filialeids=this.$login.f.orgid
-      const data = {
-        condition: `f_filiale_id in ('${f_filialeids}') and overday >= 0 and  defname  in ('维修员接单',' 站点接单','派单员接单','话务员派单','催单接收','维护接收','修改接收') and (f_state != '撤销' or f_state is null or f_state = '') `
+    workorderOverRemind(){
+      let data = {
+        condition:'1=2'
+      }
+      if (this.$login.f.orgs == '集团公司' || this.$login.f.orgs == '富瑞能源'){
+        data = {
+          condition: `overday >= 0 and  defname  in ('维修员接单',' 站点接单','派单员接单','话务员派单','催单接收','维护接收','修改接收') and (f_state != '撤销' or f_state is null or f_state = '') and f_result_status is null`
+        }
+      }else {
+        const f_filialeids = this.$login.f.orgid;
+        data = {
+          condition: `f_filiale_id in ('${f_filialeids}') and overday >= 0 and  defname  in ('维修员接单',' 站点接单','派单员接单','话务员派单','催单接收','维护接收','修改接收') and (f_state != '撤销' or f_state is null or f_state = '') and f_result_status is null`
+        }
       }
       new HttpResetClass().load('POST','rs/sql/serviceDetails/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
         if(res.data && res.data.n !== 0){
-          // this.$showMessage('你有'+res.data.n+'个工单已逾期，请尽快处理')
           this.yuqitishi = true
           this.num = res.data.n
         }
       })
-      // if(this.functions && this.functions.f_role_name && this.functions.f_role_name.indexOf('管理员') !== -1 && this.functions.f_role_name.indexOf('管理人员') == -1){
-      //   const data = {
-      //     condition: ` and f_filiale_id = '${this.$login.f.orgid}' and overday >= 0  and (f_state != '撤销' or f_state is null) and   defname  in ('维修员接单',' 站点接单','派单员接单','话务员派单','催单接收','维护接收','修改接收') and (f_state != '撤销' or f_state is null or f_state = '') `
-      //   }
-      //   new HttpResetClass().load('POST','rs/sql/serviceDetails/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
-      //     if(res.data && res.data.n !== 0){
-      //       /*this.$showMessage('你有'+res.data.n+'个工单已逾期，请尽快处理')*/
-      //       this.yuqitishi = true
-      //       this.num = res.data.n
-      //     }
-      //   })
-      // }
     },
     openUrl() {
       var url = `http://123.60.214.109:8406/submitTicket?contact=${this.$login.f.name}&orgName=${this.$login.f.orgs}&phone=${this.$login.f.f_user_telephone}`

package/src/filiale/furuike/system.js

@@ -1,7 +1,7 @@
-// 分公司特殊组件页面注册
-
-exports.specialComp =  {
-  'home-page': (resolve) => require(['./Main'], resolve),
-  'login': (resolve) => require(['./Login'], resolve)
-}
-
+// 分公司特殊组件页面注册
+
+exports.specialComp =  {
+  'home-page': (resolve) => require(['./Main'], resolve),
+  'login': (resolve) => require(['./Login'], resolve)
+}
+