system-clients 3.3.3-v3-test1 → 3.3.4-v3

package/src/filiale/chengtou/Login.vue

@@ -140,6 +140,7 @@
 
 <script>
 import co from 'co'
+import { isStrongPassword } from '../../util/password-validation'
 import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
@@ -204,7 +205,7 @@ let saveGen = function *(self) {
     }
     console.log(self.$login.depPrompt)
     // 弱口令验证（默认开启，跳转过来的不进行验证）
-    if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })
@@ -359,20 +360,21 @@ export default {
     },
     async getDaiBan(){
       let http = new HttpResetClass()
-      let res
+      let condition = ''
       if(this.$login.f.deps!=='柠条塔'){
-        res = await http.load('POST', '/rs/sql/safeOrderCenterQuery', {}, {
-        resolveMsg: null,
-        rejectMsg: null
-      })
+        condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
       } else {
-        res = await http.load('POST', '/rs/sql/safeOrderCenterQueryBySliceArea', {f_slice_area: '柠条塔'}, {
+        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
+        }}, {
         resolveMsg: null,
         rejectMsg: null
-      })
-      }
-      let OrderDaiBan = {}
-      res.data.forEach(item=>{
+      }).then((res) => {
+        let OrderDaiBan = {}
+        res.data.forEach(item=>{
         OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
         OrderDaiBan[item.f_ordertype].push(item)
       })
@@ -380,6 +382,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: {
@@ -401,6 +404,7 @@ export default {
         this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
       }
     })
+
     },
     async getDaiBanA(){
       // 是否全局开启待办通知

package/src/filiale/dongguan/Login.vue

@@ -146,6 +146,7 @@
 
 <script>
 import co from 'co'
+import { isStrongPassword } from '../../util/password-validation'
 import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
@@ -210,7 +211,7 @@ let saveGen = function *(self) {
     }
     console.log(self.$login.depPrompt)
     // 弱口令验证（默认开启，跳转过来的不进行验证）
-    if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })
@@ -350,20 +351,21 @@ export default {
   methods: {
     async getDaiBan(){
       let http = new HttpResetClass()
-      let res
+      let condition = ''
       if(this.$login.f.deps!=='柠条塔'){
-        res = await http.load('POST', '/rs/sql/safeOrderCenterQuery', {}, {
-        resolveMsg: null,
-        rejectMsg: null
-      })
+        condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
       } else {
-        res = await http.load('POST', '/rs/sql/safeOrderCenterQueryBySliceArea', {f_slice_area: '柠条塔'}, {
+        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
+        }}, {
         resolveMsg: null,
         rejectMsg: null
-      })
-      }
-      let OrderDaiBan = {}
-      res.data.forEach(item=>{
+      }).then((res) => {
+        let OrderDaiBan = {}
+        res.data.forEach(item=>{
         OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
         OrderDaiBan[item.f_ordertype].push(item)
       })
@@ -371,6 +373,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: {
@@ -392,6 +395,7 @@ export default {
         this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
       }
     })
+
     },
     async getDaiBanA(){
       // 是否全局开启待办通知

package/src/filiale/dongguan/Main.vue

@@ -93,7 +93,11 @@ import co from 'co'
 import {HttpResetClass} from "vue-client";
 
 let getwartermakr = async function (self) {
-  let result = await self.$resetpost('rs/sql/safeWatermarkQuery', {}, {resolveMsg: null, rejectMsg: null});
+  let param = {
+    tablename: 't_singlevalue',
+    condition: " 1=1 and name=\'水印内容\'"
+  };
+  let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
     createWaterMark(result.data[0].value);
@@ -237,7 +241,10 @@ export default {
       this.OrderDaiBan  = ''
       this.AppDaiBan  = ''
       let http = new HttpResetClass()
-      await http.load('POST', '/rs/sql/safeOrderCenterQueryByOrgStr', {f_orgstr: this.$login.f.orgid}, {
+      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`
+        }}, {
         resolveMsg: null,
         rejectMsg: null
       }).then((res) => {

package/src/filiale/furuike/Login.vue

@@ -133,6 +133,7 @@
 
 <script>
 import co from 'co'
+import { isStrongPassword } from '../../util/password-validation'
 import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
@@ -197,7 +198,7 @@ let saveGen = function *(self) {
     }
     console.log(self.$login.depPrompt)
     // 弱口令验证（默认开启，跳转过来的不进行验证）
-    if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })
@@ -273,7 +274,8 @@ export default {
         // this.$showMessage("re----" + JSON.stringify(re))
         if (re.data.code === 200) {
           this.showlogin = false
-          this.$resetpost('rs/sql/safeUserQueryByEname', {ename: re.data.data.userName}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          let condition = `ename = '${re.data.data.userName}'`
+          this.$resetpost('rs/sql/singleTable', {data: { items: '*', tablename: 't_user', condition: condition}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
             if (res.data && res.data.length > 0) {
               this.model.ename = res.data[0].ename
               this.model.password = res.data[0].password
@@ -395,27 +397,29 @@ export default {
     },
     async getDaiBan(){
       let http = new HttpResetClass()
-      let res
+      let condition = ''
       if(this.$login.f.deps!=='柠条塔'){
-        res = await http.load('POST', '/rs/sql/safeOrderCenterQuery', {}, {
-        resolveMsg: null,
-        rejectMsg: null
-      })
+        condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
       } else {
-        res = await http.load('POST', '/rs/sql/safeOrderCenterQueryBySliceArea', {f_slice_area: '柠条塔'}, {
+        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
+        }}, {
         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 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: {
@@ -437,6 +441,7 @@ export default {
           this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
         }
       })
+
     },
     async getDaiBanA(){
       // 是否全局开启待办通知

package/src/filiale/furuike/Main.vue

@@ -174,7 +174,11 @@ import co from 'co'
 import {HttpResetClass} from "vue-client";
 
 let getwartermakr = async function (self) {
-  let result = await self.$resetpost('rs/sql/safeWatermarkQuery', {}, {resolveMsg: null, rejectMsg: null});
+  let param = {
+    tablename: 't_singlevalue',
+    condition: " 1=1 and name=\'水印内容\'"
+  };
+  let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
     createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
@@ -323,7 +327,10 @@ export default {
       this.OrderDaiBan  = ''
       this.AppDaiBan  = ''
       let http = new HttpResetClass()
-      await http.load('POST', '/rs/sql/safeOrderCenterQueryByOrgStr', {f_orgstr: this.$login.f.orgid}, {
+      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`
+        }}, {
         resolveMsg: null,
         rejectMsg: null
       }).then((res) => {
@@ -393,8 +400,12 @@ export default {
     },
     async workorderOverRemind(){
       if(this.functions && this.functions.f_role_name && this.functions.f_role_name.indexOf('管理员') !== -1 && this.functions.f_role_name.indexOf('管理人员') == -1){
-        let res = await new HttpResetClass().load('POST', '/rs/sql/safeOrganizationQueryByParentId', {
-          parentid: this.functions.orgid
+        let res = await new HttpResetClass().load('POST', '/rs/sql/tel_singleTable', {
+          "data": {
+            "items": "*",
+            "tablename": "t_organization",
+            "condition": `parentid = '${this.functions.orgid}'`
+          }
         }, {resolveMsg: null, rejectMsg: null})
         const f_filialeids = [this.functions.orgid]
         for (const f of res.data) {
@@ -402,8 +413,7 @@ export default {
         }
 
         const data = {
-          f_filiale_ids: f_filialeids.join(','),
-          overday: 0
+          condition: `f_filiale_id in (${f_filialeids.join(',')}) and overday >= 0`
         }
         new HttpResetClass().load('POST','rs/sql/serviceDetails/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
           if(res.data && res.data.n !== 0){

package/src/filiale/gehua/Main.vue

@@ -147,7 +147,11 @@ import co from 'co'
 import {HttpResetClass} from "vue-client";
 
 let getwartermakr = async function (self) {
-  let result = await self.$resetpost('rs/sql/safeWatermarkQuery', {}, {resolveMsg: null, rejectMsg: null});
+  let param = {
+    tablename: 't_singlevalue',
+    condition: " 1=1 and name=\'水印内容\'"
+  };
+  let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
     createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
@@ -287,7 +291,10 @@ export default {
       this.OrderDaiBan  = ''
       this.AppDaiBan  = ''
       let http = new HttpResetClass()
-      await http.load('POST', '/rs/sql/safeOrderCenterQueryByOrgStr', {f_orgstr: this.$login.f.orgid}, {
+      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`
+        }}, {
         resolveMsg: null,
         rejectMsg: null
       }).then((res) => {

package/src/filiale/konggang/Login.vue

@@ -131,6 +131,7 @@
 
 <script>
   import co from 'co'
+  import { isStrongPassword } from '../../util/password-validation'
   import $ from 'jquery'
   import Vue from 'vue'
   import {HttpResetClass} from 'vue-client'
@@ -193,7 +194,7 @@
       }
       console.log(self.$login.depPrompt)
       // 弱口令验证（默认开启，跳转过来的不进行验证）
-      if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+      if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
         self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
           self.modifyPwShow = true
         })
@@ -324,27 +325,29 @@
     methods: {
       async getDaiBan(){
         let http = new HttpResetClass()
-        let res
+        let condition = ''
         if(this.$login.f.deps!=='柠条塔'){
-          res = await http.load('POST', '/rs/sql/safeOrderCenterQuery', {}, {
-          resolveMsg: null,
-          rejectMsg: null
-        })
+          condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
         } else {
-          res = await http.load('POST', '/rs/sql/safeOrderCenterQueryBySliceArea', {f_slice_area: '柠条塔'}, {
+          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
+          }}, {
           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 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: {
@@ -366,6 +369,7 @@
             this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
           }
         })
+
       },
       async loginother(){
         if (this.config.distanceLogin) {

package/src/filiale/qianneng/Login.vue

@@ -142,6 +142,7 @@
 
 <script>
 import co from 'co'
+import { isStrongPassword } from '../../util/password-validation'
 import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
@@ -206,7 +207,7 @@ let saveGen = function *(self) {
     }
     console.log(self.$login.depPrompt)
     // 弱口令验证（默认开启，跳转过来的不进行验证）
-    if ((!self.otherLogin) && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(.)(\1)+)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(self.model.password))) {
+    if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })
@@ -375,27 +376,29 @@ export default {
     },
     async getDaiBan(){
       let http = new HttpResetClass()
-      let res
+      let condition = ''
       if(this.$login.f.deps!=='柠条塔'){
-        res = await http.load('POST', '/rs/sql/safeOrderCenterQuery', {}, {
-        resolveMsg: null,
-        rejectMsg: null
-      })
+        condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
       } else {
-        res = await http.load('POST', '/rs/sql/safeOrderCenterQueryBySliceArea', {f_slice_area: '柠条塔'}, {
+        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
+        }}, {
         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 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: {
@@ -417,6 +420,7 @@ export default {
           this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
         }
       })
+
     },
     async getDaiBanA(){
       // 是否全局开启待办通知

package/src/filiale/qianneng/Main.vue

@@ -157,7 +157,11 @@ import co from 'co'
 import {HttpResetClass} from "vue-client";
 
 let getwartermakr = async function (self) {
-  let result = await self.$resetpost('rs/sql/safeWatermarkQuery', {}, {resolveMsg: null, rejectMsg: null});
+  let param = {
+    tablename: 't_singlevalue',
+    condition: " 1=1 and name=\'水印内容\'"
+  };
+  let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
     createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
@@ -296,7 +300,10 @@ export default {
       this.OrderDaiBan  = ''
       this.AppDaiBan  = ''
       let http = new HttpResetClass()
-      await http.load('POST', '/rs/sql/safeOrderCenterQueryByOrgStr', {f_orgstr: this.$login.f.orgid}, {
+      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`
+        }}, {
         resolveMsg: null,
         rejectMsg: null
       }).then((res) => {