system-clients 3.2.89 → 3.2.90-tongchuan

package/src/filiale/qianneng/Main.vue

@@ -161,7 +161,6 @@ let getwartermakr = async function (self) {
     tablename: 't_singlevalue',
     condition: " 1=1 and name=\'水印内容\'"
   };
-  // todo v4
   let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
@@ -432,7 +431,6 @@ export default {
             username: this.$login.f.name,
             usertelephone: this.$login.f.f_user_telephone
           }
-          // todo v4
           await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
           window.location.reload()
         }

package/src/filiale/qianneng/ModifyPw.vue

@@ -62,7 +62,6 @@
     // let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
     // let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
     //  Util.f.password = self.deliver.newpassword
-    // todo v4
     let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver })
     self.$login.f.password = self.deliver.newpassword
     if (res.data) {

package/src/filiale/rizhao/Login.vue

@@ -127,7 +127,6 @@ import {HttpResetClass} from 'vue-client'
 
 
 
-// todo v4
 let saveGen = function *(self) {
   try {
     if(self.$login){
@@ -299,7 +298,6 @@ export default {
       if (this.config.distanceLogin) {
         if (this.$login && this.$login.getUrlParames('name') ) {
           let ename = this.$login.getUrlParames('name');
-          // todo v4
           let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
           if(logininfo.data){
             if(logininfo.data.ename && logininfo.data.password){

package/src/filiale/shiquan/Login.vue

@@ -174,7 +174,6 @@
       console.log('登录配置', self.config)
       if (self.config.isMac) {
         // 获取该登录人分公司下的mac配置
-        // todo v4
         let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
           resolveMsg: null,
           rejectMsg: null
@@ -436,7 +435,6 @@
         if (this.config.distanceLogin) {
           if (this.$login && this.$login.getUrlParames('name') ) {
             let ename = this.$login.getUrlParames('name');
-            // todo v4
             let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
             if(logininfo.data){
               if(logininfo.data.ename && logininfo.data.password){

package/src/filiale/tianyi/Login.vue

@@ -178,7 +178,6 @@ let saveGen = function *(self) {
     console.log('登录配置', self.config)
     if (self.config.isMac) {
       // 获取该登录人分公司下的mac配置
-      // todo v4
       let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
         resolveMsg: null,
         rejectMsg: null
@@ -443,7 +442,6 @@ export default {
       if (this.config.distanceLogin) {
         if (this.$login && this.$login.getUrlParames('name') ) {
           let ename = this.$login.getUrlParames('name');
-          // todo v4
           let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
           if(logininfo.data){
             if(logininfo.data.ename && logininfo.data.password){

package/src/filiale/tongchuan/Login.vue

@@ -171,7 +171,6 @@ let saveGen = function *(self) {
     console.log('登录配置', self.config)
     if (self.config.isMac) {
       // 获取该登录人分公司下的mac配置
-      // todo v4
       let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
         resolveMsg: null,
         rejectMsg: null
@@ -448,7 +447,6 @@ export default {
       if (this.config.distanceLogin) {
         if (this.$login && this.$login.getUrlParames('name') ) {
           let ename = this.$login.getUrlParames('name');
-          // todo v4
           let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
           if(logininfo.data){
             if(logininfo.data.ename && logininfo.data.password){

package/src/filiale/tongchuan/Main.vue

@@ -212,7 +212,6 @@ let getwartermakr = async function (self) {
     tablename: 't_singlevalue',
     condition: " 1=1 and name=\'水印内容\'"
   };
-  // todo v4
   let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
@@ -309,6 +308,7 @@ let createWaterMark = function (userName) {
     },
     ready() {
       getwartermakr(this);
+      this.getTimesgotoWzkfPage()
       let component = this.$login.getUrlCompileParames('component')
       if (component) {
         this.isManger = true
@@ -377,7 +377,6 @@ let createWaterMark = function (userName) {
         this.model.f_stopgas_id = this.notices.id
         this.model.f_user_id = this.$login.f.id
         console.log('保存', this.model)
-        // todo v4
         this.$resetpost('rs/logic/savenoticenotarize', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
           this.model.f_stopgas_id = ''
           this.model.f_user_id = ''
@@ -481,6 +480,20 @@ let createWaterMark = function (userName) {
           this.newTipShow = true
         }
       },
+      getTimesgotoWzkfPage(){
+        let teltimes = 2*60*1000 // 两分钟
+        try {
+          this.intervaltx =setInterval(()=>{
+            let msg = localStorage.getItem('wzKfMessage')
+            if(msg){
+              localStorage.removeItem('wzKfMessage')
+              this.$showMessage(`你有${msg}条客户消息待处理,请尽快前往文字客服页面进行处理`)
+            }
+          },teltimes)
+        }catch (e) {
+          console.log('捕获到异常', e)
+        }
+      },
       getTimesgotoWorkOrderSite(){
         let teltimes = 2*60*1000 // 两分钟
         try {
@@ -568,6 +581,7 @@ let createWaterMark = function (userName) {
                 res.data.forEach(itre => {
                   let band = null
                   if ('f_dynamic_expire' in itre) {
+                      console.log(itre.f_dynamic_expire)
                       if (itre.f_dynamic_expire !== null && itre.f_dynamic_expire !== '') {
                         let todayold =  new Date(itre.f_dynamic_expire)
                         todayold.setDate(todayold.getDate() - parseInt(this.$appdata.getSingleValue('动态库提醒天数设置')))
@@ -697,7 +711,6 @@ let createWaterMark = function (userName) {
             username: this.$login.f.name,
             usertelephone: this.$login.f.f_user_telephone
           }
-          // todo v4
           await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
           window.location.reload()
         }