system-clients 3.3.3-old → 3.3.3-v3-test

package/src/filiale/tianyi/Login.vue

@@ -148,6 +148,7 @@ import co from 'co'
 import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
+import {isPasswordModificationExpired} from '../../components/Util'
 
 let daibanJson = require('../../util/Daiban.json')
 
@@ -207,12 +208,15 @@ let saveGen = function *(self) {
       }
     }
     console.log(self.$login.depPrompt)
-    // 弱口令验证
-    //跳转过来的不进行验证
-    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    // 弱口令验证（默认开启，跳转过来的不进行验证）
+    if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })
+    } else if ((!self.otherLogin) && isPasswordModificationExpired(self.$login.f.f_last_modification_time)) {
+      self.$showMessage('登录系统: 您的密码已超过两个半月未修改，请修改密码后重新登录！！！', ['confirm']).then((res) => {
+        self.modifyPwShow = true
+      })
     } else if ((!self.otherLogin) && self.$login.depPrompt) {
       self.depPromptShow = true
       if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
@@ -238,6 +242,8 @@ let saveGen = function *(self) {
 
   } catch (ret) {
     console.error('登录失败', ret)
+    self.$login.s = null
+    self.$login['v3-session-key'] = null
     let msg
     if (ret instanceof Error) {
       msg = ret
@@ -264,19 +270,19 @@ export default {
     this.titleShow = this.$appdata.getSingleValue('关于我们')
     window.versionTime = window.versionTime ? window.versionTime : new Date().getTime()
     this.vTime = this.format(new Date(window.versionTime));
-    try{
-      let http = new HttpResetClass()
-      let res = await http.load('POST', 'rs/sql/singleTable',
-        {data:{
-            tablename: 't_changedeclare',
-            condition: ` f_type ='变更通知' `
-          }
-        }, {resolveMsg: null, rejectMsg: null})
-      if(res.data.length>0){
-        console.log("---------------获取通知",res.data[0].f_change_message)
-        this.notice=res.data[0].f_change_message
-      }
-    }catch(e){}
+    // try{
+    //   let http = new HttpResetClass()
+    //   let res = await http.load('POST', 'rs/sql/singleTable',
+    //     {data:{
+    //         tablename: 't_changedeclare',
+    //         condition: ` f_type ='变更通知' `
+    //       }
+    //     }, {resolveMsg: null, rejectMsg: null})
+    //   if(res.data.length>0){
+    //     console.log("---------------获取通知",res.data[0].f_change_message)
+    //     this.notice=res.data[0].f_change_message
+    //   }
+    // }catch(e){}
 
     this.loginother();
     $('#login-button').click(function (event) {
@@ -285,10 +291,8 @@ export default {
     })
     if (window.location.search && window.location.search.indexOf('af_key') !== -1&& window.location.search.indexOf('af_n') !== -1) {
       const subUrl = window.location.search.replace('?af_key=','').split('&af_n=')
-      console.log(subUrl)
       this.model.ename = window.atob(subUrl[0])
       this.model.password = window.atob(subUrl[1])
-      console.log('this.model.ename',this.model.ename)
       this.otherLogin = true
       this.confirm()
     }else{
@@ -360,21 +364,20 @@ export default {
     },
     async getDaiBan(){
       let http = new HttpResetClass()
-      let condition = ''
+      let res
       if(this.$login.f.deps!=='柠条塔'){
-        condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQuery', {}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
       } else {
-        condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
-      }
-      await http.load('POST', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:condition
-        }}, {
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQueryBySliceArea', {f_slice_area: '柠条塔'}, {
         resolveMsg: null,
         rejectMsg: null
-      }).then((res) => {
-        let OrderDaiBan = {}
-        res.data.forEach(item=>{
+      })
+      }
+      let OrderDaiBan = {}
+      res.data.forEach(item=>{
         OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
         OrderDaiBan[item.f_ordertype].push(item)
       })
@@ -382,15 +385,7 @@ export default {
       if (res.data.length> 0){
         this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
       }
-    })
-      let data = {
-        condition: '1 = 1',
-        data: {
-          orgid: this.$login.f.orgid,
-          id: this.$login.f.id
-        }
-      }
-      await http.load('POST', '/rs/sql/checkuser', {data: data}, {
+    },
         resolveMsg: null,
         rejectMsg: null
       }).then((res) => {

package/src/filiale/tongchuan/Login.vue

@@ -141,6 +141,7 @@ import co from 'co'
 import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
+import {isPasswordModificationExpired} from '../../components/Util'
 
 let daibanJson = require('../../util/Daiban.json')
 
@@ -200,12 +201,15 @@ let saveGen = function *(self) {
       }
     }
     console.log(self.$login.depPrompt)
-    // 弱口令验证
-    //跳转过来的不进行验证
-    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    // 弱口令验证（默认开启，跳转过来的不进行验证）
+    if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })
+    } else if ((!self.otherLogin) && isPasswordModificationExpired(self.$login.f.f_last_modification_time)) {
+      self.$showMessage('登录系统: 您的密码已超过两个半月未修改，请修改密码后重新登录！！！', ['confirm']).then((res) => {
+        self.modifyPwShow = true
+      })
     } else if ((!self.otherLogin) && self.$login.depPrompt) {
       self.depPromptShow = true
       if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
@@ -231,6 +235,8 @@ let saveGen = function *(self) {
 
   } catch (ret) {
     console.error('登录失败', ret)
+    self.$login.s = null
+    self.$login['v3-session-key'] = null
     let msg
     if (ret instanceof Error) {
       msg = ret
@@ -255,19 +261,19 @@ export default {
   title: '登录',
   async ready () {
     this.titleShow = this.$appdata.getSingleValue('关于我们')
-    try{
-      let http = new HttpResetClass()
-      let res = await http.load('POST', 'rs/sql/singleTable',
-        {data:{
-            tablename: 't_changedeclare',
-            condition: ` f_type ='变更通知' `
-          }
-        }, {resolveMsg: null, rejectMsg: null})
-      if(res.data.length>0){
-        console.log("---------------获取通知",res.data[0].f_change_message)
-        this.notice=res.data[0].f_change_message
-      }
-    }catch(e){}
+    // try{
+    //   let http = new HttpResetClass()
+    //   let res = await http.load('POST', 'rs/sql/singleTable',
+    //     {data:{
+    //         tablename: 't_changedeclare',
+    //         condition: ` f_type ='变更通知' `
+    //       }
+    //     }, {resolveMsg: null, rejectMsg: null})
+    //   if(res.data.length>0){
+    //     console.log("---------------获取通知",res.data[0].f_change_message)
+    //     this.notice=res.data[0].f_change_message
+    //   }
+    // }catch(e){}
 
     this.loginother();
     $('#login-button').click(function (event) {
@@ -276,10 +282,8 @@ export default {
     })
     if (window.location.search && window.location.search.indexOf('af_key') !== -1&& window.location.search.indexOf('af_n') !== -1) {
       const subUrl = window.location.search.replace('?af_key=','').split('&af_n=')
-      console.log(subUrl)
       this.model.ename = window.atob(subUrl[0])
       this.model.password = window.atob(subUrl[1])
-      console.log('this.model.ename',this.model.ename)
       this.otherLogin = true
       this.confirm()
     }else{
@@ -365,21 +369,20 @@ export default {
     },
     async getDaiBan(){
       let http = new HttpResetClass()
-      let condition = ''
+      let res
       if(this.$login.f.deps!=='柠条塔'){
-        condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQuery', {}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
       } else {
-        condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
-      }
-      await http.load('POST', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:condition
-        }}, {
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQueryBySliceArea', {f_slice_area: '柠条塔'}, {
         resolveMsg: null,
         rejectMsg: null
-      }).then((res) => {
-        let OrderDaiBan = {}
-        res.data.forEach(item=>{
+      })
+      }
+      let OrderDaiBan = {}
+      res.data.forEach(item=>{
         OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
         OrderDaiBan[item.f_ordertype].push(item)
       })
@@ -387,15 +390,7 @@ export default {
       if (res.data.length> 0){
         this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
       }
-    })
-      let data = {
-        condition: '1 = 1',
-        data: {
-          orgid: this.$login.f.orgid,
-          id: this.$login.f.id
-        }
-      }
-      await http.load('POST', '/rs/sql/checkuser', {data: data}, {
+    },
         resolveMsg: null,
         rejectMsg: null
       }).then((res) => {

package/src/filiale/tongchuan/Main.vue

@@ -208,11 +208,7 @@ import co from 'co'
 import {HttpResetClass} from "vue-client";
 
 let getwartermakr = async function (self) {
-  let param = {
-    tablename: 't_singlevalue',
-    condition: " 1=1 and name=\'水印内容\'"
-  };
-  let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
+  let result = await self.$resetpost('rs/sql/safeWatermarkQuery', {}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
     createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
@@ -386,41 +382,29 @@ let createWaterMark = function (userName) {
       },
       isNotarize (stopId,userid) {
         let http = new HttpResetClass()
-        var condition = `f_stopgas_id = '${stopId}' and f_user_id = '${userid}'`
-        let data = {
-          items: '*',
-          tablename: 't_notice_notarize',
-          condition: condition,
-          orderitem: 'f_id desc'
-        }
-         http.load('POST', 'rs/sql/singleTable_OrderBy', {data: data}, {
+        var f_stopgas_id = stopId
+        let res = await http.load('POST', 'rs/sql/safeNoticeNotarizeQuery', {
+          f_stopgas_id: f_stopgas_id,
+          f_user_id: userid
+        }, {
           resolveMsg: null,
           rejectMsg: null
-        }).then((res) => {
-          if (res.data.length === 0) {
-            this.shownotices = true
-          }else if (res.data[0].f_pcstate !== '已确认' ){
-            this.model.f_id = res.data[0].f_id
-            this.shownotices = false
-          } else {
-            this.shownotices = false
-          }
-        }).catch((e)=>{
-          console.log('报错了！！')
-          console.error(e)
         })
-
+        if (res.data.length === 0) {
+          this.shownotices = true
+        }else if (res.data[0].f_pcstate !== '已确认' ){
+          this.model.f_id = res.data[0].f_id
+          this.shownotices = false
+        } else {
+          this.shownotices = false
+        }
       },
       async stopsPC () {
         let http = new HttpResetClass()
-        var condition = `f_orgstr = '${this.$login.f.orgid}' and f_state = '公告中' and f_typeofreceipt = 'PC端'`
-        let data = {
-          items: '*',
-          tablename: 't_stopgas',
-          condition: condition,
-          orderitem: 'f_date desc'
-        }
-        await http.load('POST', 'rs/sql/singleTable_OrderBy', {data: data}, {
+        await http.load('POST', 'rs/sql/safeStopgasQuery', {
+          f_orgstr: this.$login.f.orgid,
+          f_typeofreceipt: 'PC端'
+        }, {
           resolveMsg: null,
           rejectMsg: null
         }).then((res) => {
@@ -493,10 +477,7 @@ let createWaterMark = function (userName) {
         this.OrderDaiBan  = ''
         this.AppDaiBan  = ''
         let http = new HttpResetClass()
-        await http.load('POST', '/rs/sql/singleTable', {data: {
-            tablename:'t_order_center',
-            condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
-          }}, {
+        await http.load('POST', '/rs/sql/safeOrderCenterQueryByOrgStr', {f_orgstr: this.$login.f.orgid}, {
           resolveMsg: null,
           rejectMsg: null
         }).then((res) => {
@@ -541,10 +522,7 @@ let createWaterMark = function (userName) {
       async getExpireDate(){
         // 获取分公司的表品牌id
         let http = new HttpResetClass()
-        await http.load('POST', '/rs/sql/singleTable', {data: {
-            tablename:'t_gasbrand_orgid',
-            condition:`f_using_orgid ='${this.$login.f.orgid}'`
-          }}, {
+        await http.load('POST', '/rs/sql/safeGasbrandOrgidQueryByOrgId', {f_using_orgid: this.$login.f.orgid}, {
           resolveMsg: null,
           rejectMsg: null
         }).then((res) => {
@@ -555,10 +533,7 @@ let createWaterMark = function (userName) {
           }
           if (this.gasbrandIdData.length > 0) {
             // 获取卡表到期时间
-            http.load('POST', '/rs/sql/singleTable', {data: {
-                tablename:'t_gasbrand',
-                condition:`id in (${this.gasbrandIdData}) and f_meter_type like '%卡表%'`
-              }}, {
+            http.load('POST', '/rs/sql/safeGasbrandQueryByIds', {ids: this.gasbrandIdData.join(',')}, {
               resolveMsg: null,
               rejectMsg: null
             }).then((res) => {
@@ -617,7 +592,7 @@ let createWaterMark = function (userName) {
         }
       },
       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}`
+        var url = `https://liuli.aofengcloud.com:31467`
         window.open(url, '_blank')
       },
       hindsetting() {

package/src/filiale/weinan/Main.vue

@@ -185,11 +185,7 @@ import co from 'co'
 import {HttpResetClass} from "vue-client";
 
 let getwartermakr = async function (self) {
-  let param = {
-    tablename: 't_singlevalue',
-    condition: " 1=1 and name=\'水印内容\'"
-  };
-  let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
+  let result = await self.$resetpost('rs/sql/safeWatermarkQuery', {}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
     createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
@@ -397,10 +393,7 @@ export default {
       this.OrderDaiBan  = ''
       this.AppDaiBan  = ''
       let http = new HttpResetClass()
-      await http.load('POST', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
-        }}, {
+      await http.load('POST', '/rs/sql/safeOrderCenterQueryByOrgStr', {f_orgstr: this.$login.f.orgid}, {
         resolveMsg: null,
         rejectMsg: null
       }).then((res) => {
@@ -445,10 +438,7 @@ export default {
     async getExpireDate(){
       // 获取分公司的表品牌id
       let http = new HttpResetClass()
-      await http.load('POST', '/rs/sql/singleTable', {data: {
-          tablename:'t_gasbrand_orgid',
-          condition:`f_using_orgid ='${this.$login.f.orgid}'`
-        }}, {
+      await http.load('POST', '/rs/sql/safeGasbrandOrgidQueryByOrgId', {f_using_orgid: this.$login.f.orgid}, {
         resolveMsg: null,
         rejectMsg: null
       }).then((res) => {
@@ -459,10 +449,7 @@ export default {
         }
         if (this.gasbrandIdData.length > 0) {
           // 获取卡表到期时间
-          http.load('POST', '/rs/sql/singleTable', {data: {
-              tablename:'t_gasbrand',
-              condition:`id in (${this.gasbrandIdData}) and f_meter_type like '%卡表%'`
-            }}, {
+          http.load('POST', '/rs/sql/safeGasbrandQueryByIds', {ids: this.gasbrandIdData.join(',')}, {
             resolveMsg: null,
             rejectMsg: null
           }).then((res) => {
@@ -521,7 +508,7 @@ export default {
       }
     },
     openUrl() {
-      var url = `http://172.168.1.13:9999/submitTicket?contact=${this.$login.f.name}&orgName=${this.$login.f.orgs}&phone=${this.$login.f.f_user_telephone}`
+      var url = `https://liuli.aofengcloud.com:31467`
       window.open(url, '_blank')
     },
     hindsetting() {

package/src/filiale/wenxi/Login.vue

@@ -141,6 +141,7 @@ import co from 'co'
 import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
+import {isPasswordModificationExpired} from '../../components/Util'
 
 let daibanJson = require('../../util/Daiban.json')
 
@@ -200,12 +201,15 @@ let saveGen = function *(self) {
       }
     }
     console.log(self.$login.depPrompt)
-    // 弱口令验证
-    //跳转过来的不进行验证
-    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    // 弱口令验证（默认开启，跳转过来的不进行验证）
+    if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })
+    } else if ((!self.otherLogin) && isPasswordModificationExpired(self.$login.f.f_last_modification_time)) {
+      self.$showMessage('登录系统: 您的密码已超过两个半月未修改，请修改密码后重新登录！！！', ['confirm']).then((res) => {
+        self.modifyPwShow = true
+      })
     } else if ((!self.otherLogin) && self.$login.depPrompt) {
       self.depPromptShow = true
       if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
@@ -231,6 +235,8 @@ let saveGen = function *(self) {
 
   } catch (ret) {
     console.error('登录失败', ret)
+    self.$login.s = null
+    self.$login['v3-session-key'] = null
     let msg
     if (ret instanceof Error) {
       msg = ret
@@ -257,19 +263,19 @@ export default {
     this.titleShow = this.$appdata.getSingleValue('关于我们')
     window.versionTime = window.versionTime ? window.versionTime : new Date().getTime()
     this.vTime = this.format(new Date(window.versionTime));
-    try{
-      let http = new HttpResetClass()
-      let res = await http.load('POST', 'rs/sql/singleTable',
-        {data:{
-            tablename: 't_changedeclare',
-            condition: ` f_type ='变更通知' `
-          }
-        }, {resolveMsg: null, rejectMsg: null})
-      if(res.data.length>0){
-        console.log("---------------获取通知",res.data[0].f_change_message)
-        this.notice=res.data[0].f_change_message
-      }
-    }catch(e){}
+    // try{
+    //   let http = new HttpResetClass()
+    //   let res = await http.load('POST', 'rs/sql/singleTable',
+    //     {data:{
+    //         tablename: 't_changedeclare',
+    //         condition: ` f_type ='变更通知' `
+    //       }
+    //     }, {resolveMsg: null, rejectMsg: null})
+    //   if(res.data.length>0){
+    //     console.log("---------------获取通知",res.data[0].f_change_message)
+    //     this.notice=res.data[0].f_change_message
+    //   }
+    // }catch(e){}
 
     this.loginother();
     $('#login-button').click(function (event) {
@@ -278,10 +284,8 @@ export default {
     })
     if (window.location.search && window.location.search.indexOf('af_key') !== -1&& window.location.search.indexOf('af_n') !== -1) {
       const subUrl = window.location.search.replace('?af_key=','').split('&af_n=')
-      console.log(subUrl)
       this.model.ename = window.atob(subUrl[0])
       this.model.password = window.atob(subUrl[1])
-      console.log('this.model.ename',this.model.ename)
       this.otherLogin = true
       this.confirm()
     }else{
@@ -353,37 +357,28 @@ export default {
     },
     async getDaiBan(){
       let http = new HttpResetClass()
-      let condition = ''
+      let res
       if(this.$login.f.deps!=='柠条塔'){
-        condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQuery', {}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
       } else {
-        condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
-      }
-      await http.load('POST', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:condition
-        }}, {
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQueryBySliceArea', {f_slice_area: '柠条塔'}, {
         resolveMsg: null,
         rejectMsg: null
-      }).then((res) => {
-        let OrderDaiBan = {}
-        res.data.forEach(item=>{
-          OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
-          OrderDaiBan[item.f_ordertype].push(item)
-        })
-        this.OrderDaiBan = `您有${res.data.length}条需要处理的微信预约业务！`
-        if (res.data.length> 0){
-          this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
-        }
       })
-      let data = {
-        condition: '1 = 1',
-        data: {
-          orgid: this.$login.f.orgid,
-          id: this.$login.f.id
-        }
       }
-      await http.load('POST', '/rs/sql/checkuser', {data: data}, {
+      let OrderDaiBan = {}
+      res.data.forEach(item=>{
+        OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
+        OrderDaiBan[item.f_ordertype].push(item)
+      })
+      this.OrderDaiBan = `您有${res.data.length}条需要处理的微信预约业务！`
+      if (res.data.length> 0){
+        this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
+      }
+    },
         resolveMsg: null,
         rejectMsg: null
       }).then((res) => {

package/src/filiale/wenxi/Main.vue

@@ -161,11 +161,7 @@ import co from 'co'
 import {HttpResetClass} from "vue-client";
 
 let getwartermakr = async function (self) {
-  let param = {
-    tablename: 't_singlevalue',
-    condition: " 1=1 and name=\'水印内容\'"
-  };
-  let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
+  let result = await self.$resetpost('rs/sql/safeWatermarkQuery', {}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
     createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
@@ -311,10 +307,7 @@ export default {
       this.OrderDaiBan  = ''
       this.AppDaiBan  = ''
       let http = new HttpResetClass()
-      await http.load('POST', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
-        }}, {
+      await http.load('POST', '/rs/sql/safeOrderCenterQueryByOrgStr', {f_orgstr: this.$login.f.orgid}, {
         resolveMsg: null,
         rejectMsg: null
       }).then((res) => {
@@ -383,7 +376,7 @@ export default {
       }
     },
     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}`
+      var url = `https://liuli.aofengcloud.com:31467`
       window.open(url, '_blank')
     },
     hindsetting() {

package/src/filiale/wuhai/Main.vue

@@ -161,11 +161,7 @@ import co from 'co'
 import {HttpResetClass} from "vue-client";
 
 let getwartermakr = async function (self) {
-  let param = {
-    tablename: 't_singlevalue',
-    condition: " 1=1 and name=\'水印内容\'"
-  };
-  let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
+  let result = await self.$resetpost('rs/sql/safeWatermarkQuery', {}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
     createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
@@ -316,10 +312,7 @@ export default {
       this.OrderDaiBan  = ''
       this.AppDaiBan  = ''
       let http = new HttpResetClass()
-      await http.load('POST', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
-        }}, {
+      await http.load('POST', '/rs/sql/safeOrderCenterQueryByOrgStr', {f_orgstr: this.$login.f.orgid}, {
         resolveMsg: null,
         rejectMsg: null
       }).then((res) => {
@@ -388,7 +381,7 @@ export default {
       }
     },
     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}`
+      var url = `https://liuli.aofengcloud.com:31467`
       window.open(url, '_blank')
     },
     hindsetting() {
@@ -475,16 +468,9 @@ export default {
     // 微信统计投诉和咨询的条数
     async WechatOfComplaintAndConsult () {
       console.log('开始执行')
-      let WeChatData = await this.$resetpost('rs/sql/singleTable_OrderBy',{
-        data:{
-          items: 'f_isreply',
-          tablename: 't_comment',
-          condition: 'f_isreply = 0',
-          orderitem: 'f_isreply'
-        }
-      },{resolveMsg: null, rejectMsg: null});
+      let WeChatData = await this.$resetpost('rs/sql/safeCommentUnrepliedCount', {}, {resolveMsg: null, rejectMsg: null});
       if (WeChatData.data.length > 0){
-        this.WeChatNub = WeChatData.data.length
+        this.WeChatNub = WeChatData.data[0].cnt
       }
       console.log('获取数值为：'+ this.WeChatNub)
       this.$refs.tree.setNum(this.WeChatNub)