system-clients 3.2.95-ruihua1 → 3.2.95-temp

package/src/filiale/gehua/Main.vue

@@ -151,7 +151,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;
@@ -423,7 +422,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/konggang/Login.vue

@@ -162,7 +162,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
@@ -371,7 +370,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/qianneng/Login.vue

@@ -175,7 +175,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
@@ -454,7 +453,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/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;
@@ -360,12 +359,12 @@ export default {
         const data = {
           "condition":
             {
-              "condition":" 1=1 ",
+              "condition":` 1=1 and tswo.f_filiale_id = '${this.$login.f.orgid}' `,
               "sign":"1=1"
             },
           "userid":this.functions.name
         }
-        new HttpResetClass().load('POST','rs/path/operatorService/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
+        new HttpResetClass().load('POST','rs/sql/operatorService/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
           if(res.data && res.data.n !== 0){
              this.$showMessage('你有'+res.data.n+'个工单待处理，请尽快前往站点工单页面进行处理')
           }
@@ -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/rizhao/Main.vue

@@ -295,7 +295,7 @@ export default {
             username: this.$login.f.name,
             usertelephone: this.$login.f.f_user_telephone
           }
-          await this.$resetpost('api/af-system/user/logout', data, {resolveMsg: '退出成功', rejectMsg: null})
+          await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
           window.location.reload()
         }
       })

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;
@@ -377,7 +376,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 = ''
@@ -568,6 +566,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 +696,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()
         }

package/src/filiale/weinan/Main.vue

@@ -189,7 +189,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;
@@ -471,6 +470,7 @@ export default {
               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('动态库提醒天数设置')))
@@ -600,7 +600,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/wenxi/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
@@ -436,7 +435,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/wenxi/Main.vue

@@ -165,7 +165,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;
@@ -463,7 +462,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/wuhai/Main.vue

@@ -165,7 +165,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;
@@ -468,7 +467,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()
         }
@@ -477,7 +475,6 @@ export default {
     // 微信统计投诉和咨询的条数
     async WechatOfComplaintAndConsult () {
       console.log('开始执行')
-      // todo v4
       let WeChatData = await this.$resetpost('rs/sql/singleTable_OrderBy',{
         data:{
           items: 'f_isreply',

package/src/filiale/yuchuan/Login.vue

@@ -170,7 +170,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
@@ -303,7 +302,7 @@ export default {
         isMac: false,
         depPrompt: false,
         weakPassword: false,
-        title: '榆林榆川客服系统',
+        title: '燃气客服系统',
         distanceLogin: false,
         // 那些角色可以定时获取预约提示
         isTip : false,
@@ -420,7 +419,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/yuchuan/Main.vue

@@ -155,7 +155,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;
@@ -542,7 +541,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/zhoukou/Main.vue

@@ -151,7 +151,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;
@@ -423,7 +422,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/plugins/GetLoginInfoService.js

@@ -2,17 +2,33 @@ import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
 import cryptJS from './EncryptUtil'
 
-let loginGen = async function (username, password, cue) {
-  let data = {username, password,resourceName:'客服系统'}
-  const getLogin = await Vue.resetpost('/api/af-auth/login', data,
-    {resolveMsg: null, rejectMsg: null,headerConfig:{'Content-type': "application/json"}
-  })
-  if (getLogin.data) {
+let loginGen = async function (name, password, cue) {
+  let data = {name: name, password: password}
+  data = '$' + cryptJS.RSAEncrypt(JSON.stringify(data))
+  const getLogin = await Vue.resetpost('/rs/logic/getLogin', data, {resolveMsg: null, rejectMsg: null})
+  if (getLogin.data.states === '登录成功') {
     //获取jwt
-    Vue.$login.jwt = getLogin.data.resources.data.id
-    Vue.$login.jwtNew = getLogin.data.access_token
+    Vue.$login.jwt = getLogin.data.jwt
+    Vue.$login.jwtNew = getLogin.data.jwtNew
     // 调用远程登录服务，获取所有有权访问的功能
-    Vue.$login.f =  getLogin.data.resources.data
+    data = {username: name, password: password}
+    data = cryptJS.RSAEncrypt(JSON.stringify(data))
+    const resource = await Vue.resetpost(`/rs/user/userLogin/客服系统`, data, {
+      resolveMsg: null,
+      rejectMsg: null
+    })
+    // 兼容旧版ldao
+    if ((JSON.stringify(resource.data).startsWith("{") || JSON.stringify(resource.data).startsWith("[")) && resource.data.code && resource.data.msg && resource.data.code !== 200) {
+      throw {status: 555, data: resource.data.msg}
+    }
+    console.log('登陆获取Util', JSON.stringify(resource.data))
+
+    // 兼容旧版ldao，旧版不返回code
+    if ((JSON.stringify(resource.data).startsWith("{") || JSON.stringify(resource.data).startsWith("[")) && resource.data.code && resource.data.msg) {
+      Vue.$login.f = resource.data.data
+    } else {
+      Vue.$login.f = resource.data
+    }
     // 把登录用户添加到cookie里
     Vue.cookie.set('loginId', Vue.$login.f.id)
     try {
@@ -21,6 +37,7 @@ let loginGen = async function (username, password, cue) {
         source: "tool.getFullTree(this.getRights().where(row.getType() == $function$))",
         userid: Vue.$login.f.id
       }, { resolveMsg: null, rejectMsg: null })
+      console.log('有权限功能返回数据', JSON.stringify(hasRight.data))
       //准备替换功能树
       var fun = []
       hasRight.data[0].children[0].children.forEach((item) => {
@@ -30,6 +47,8 @@ let loginGen = async function (username, password, cue) {
           })
         }
       })
+      // console.log('替换前', JSON.stringify(Vue.$login.f.functions))
+      // console.log('替换后', JSON.stringify(fun))
       Vue.$login.f.functions = fun
     } catch (error) {
     }
@@ -80,6 +99,21 @@ let loginGen = async function (username, password, cue) {
         Vue.$login.f.f_installman = []
         console.log('安装人模块', error)
       }
+      // 获取换表员
+      // try {
+      //   let getChangeMeterman = await Vue.resetpost('/rs/search', {
+      //     source: 'this.getParentByType($organization$).getChildByName($换表员$).getUsers()',
+      //     userid: Vue.$login.f.id
+      //   }, {resolveMsg: null, rejectMsg: null})
+      //   let changemeterman = []
+      //   for (let i = 0; i < getChangeMeterman.data.length; i++) {
+      //     changemeterman.push(getChangeMeterman.data[i])
+      //   }
+      //   Vue.$login.f.f_changemeterman = changemeterman
+      // }catch (error) {
+      //   Vue.$login.f.f_changemeterman = []
+      //   console.log('换表员模块',error)
+      // }
       // 获取资源服务权限
       try {
         let getLic = await Vue.resetpost('/rs/search', {
@@ -97,6 +131,37 @@ let loginGen = async function (username, password, cue) {
         Vue.$login.f.f_gasman = []
         console.log('资源服务权限', error)
       }
+      // // 票据使用人
+      // try {
+      //   let getPaperUseman = await Vue.resetpost('/rs/search', {
+      //     source: 'this.getParentByType($organization$).getChildByName($票据使用人$).getUsers()',
+      //     userid: Vue.$login.f.id
+      //   }, {resolveMsg: null, rejectMsg: null})
+      //   let perperuseman = []
+      //   for (let i = 0; i < getPaperUseman.data.length; i++) {
+      //     perperuseman.push(getPaperUseman.data[i])
+      //   }
+      //   Vue.$login.f.f_paperUseman = perperuseman
+      // }catch (error) {
+      //   Vue.$login.f.f_paperUseman = []
+      //   console.log('票据使用人模块',error)
+      //
+      // }
+      // // 票据分配人
+      // try {
+      //   let getPaperAllotman = await Vue.resetpost('/rs/search', {
+      //     source: 'this.getParentByType($organization$).getChildByName($票据分配人$).getUsers()',
+      //     userid: Vue.$login.f.id
+      //   }, {resolveMsg: null, rejectMsg: null})
+      //   let paperallotman = []
+      //   for (let i = 0; i < getPaperAllotman.data.length; i++) {
+      //     paperallotman.push(getPaperAllotman.data[i])
+      //   }
+      //   Vue.$login.f.f_paperAllotman = paperallotman
+      // }catch (error) {
+      //   Vue.$login.f.f_paperAllotman = []
+      //   console.log('票据分配人模块',error)
+      // }
       // TODO 处理界面细节
       try {
         let viewDetails = await Vue.resetpost('rs/search', {
@@ -140,10 +205,7 @@ let loginGen = async function (username, password, cue) {
     }
 
   } else {
-    let error = {status: 401, data: "登录失败，请稍后重试"}
-    if (getLogin.data.code !== 500) {
-      error = {status: getLogin.data.code, data: getLogin.data.msg}
-    }
+    let error = {status: 401, data: getLogin.data.states}
     // 抛出错误
     throw error
   }

package/src/stores/AppData.js

@@ -9,7 +9,7 @@ let GetAppDataService = {
 
   // 开启卡监听
   load () {
-    return Vue.resetpost('api/af-system/logic/getInitData', {data: {f_filialeids: Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+    return Vue.resetpost('rs/logic/getInitData', {data: {f_filialeids: Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
         res.data.singleValues.forEach((item) => {
           this.singleValues[item.name] = item.value
         })