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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.3.3-v3-test1",
+  "version": "3.3.4-v3",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/components/Main.vue

@@ -185,7 +185,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}`);
@@ -393,7 +397,10 @@ let createWaterMark = function (userName) {
         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) => {
@@ -438,7 +445,10 @@ let createWaterMark = function (userName) {
       async getExpireDate(){
         // 获取分公司的表品牌id
         let http = new HttpResetClass()
-        await http.load('POST', '/rs/sql/safeGasbrandOrgidQueryByOrgId', {f_using_orgid: this.$login.f.orgid}, {
+        await http.load('POST', '/rs/sql/singleTable', {data: {
+            tablename:'t_gasbrand_orgid',
+            condition:`f_using_orgid ='${this.$login.f.orgid}'`
+          }}, {
           resolveMsg: null,
           rejectMsg: null
         }).then((res) => {
@@ -449,7 +459,10 @@ let createWaterMark = function (userName) {
           }
           if (this.gasbrandIdData.length > 0) {
             // 获取卡表到期时间
-            http.load('POST', '/rs/sql/safeGasbrandQueryByIds', {ids: this.gasbrandIdData.join(',')}, {
+            http.load('POST', '/rs/sql/singleTable', {data: {
+                tablename:'t_gasbrand',
+                condition:`id in (${this.gasbrandIdData}) and f_meter_type like '%卡表%'`
+              }}, {
               resolveMsg: null,
               rejectMsg: null
             }).then((res) => {

package/src/components/equipment/PosList.vue

@@ -166,7 +166,7 @@
       return {
         source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
         model: new PagedList('rs/sql/equipmentQuery', 20),
-        model2: new PagedList('rs/sql/safePoshistoryByTerminalNumber', 30),
+        model2: new PagedList('rs/sql/singleTable', 30, {tablename: '`t_poshistory`'}),
         curorgid: [this.f_filialeid],
         f_orgid: '',
         f_filialeids: '',
@@ -248,7 +248,8 @@
       },
       abcd (row) {
         console.log("chakan",row)
-        this.model2.search({}, {f_terminal_number: row.f_terminal_number})
+        let condition = `f_terminal_number = '${row.f_terminal_number}' order by id desc`
+        this.model2.search(condition)
         this.infoshow = true
       },
       search () {

package/src/components/equipment/PosParamAdd.vue

@@ -139,10 +139,11 @@ export default {
     async edit(param_id) {
       this.param_id = param_id
       let load = new HttpResetClass()
-      load.load("POST", 'rs/sql/safeEquipmentParamByParamId',
+      load.load("POST", 'rs/sql/singleTable',
         {
           data: {
-            f_param_id: param_id
+            tablename: ' t_equipment_param ',
+            condition: ` f_param_id = ${param_id} `
           }
         },
         {resolveMsg: null, rejectMsg: null})

package/src/components/materialManage/materialList.vue

@@ -175,7 +175,7 @@
     data(){
           //配置后台systemModule，sql
        return{
-         model: new PagedList('rs/sql/safeMaterialInfoSingleWithCondition', 50),
+         model: new PagedList('rs/sql/singleTable_OrderBy', 50),
          row: null,
          searchshow: true,
          obj: {

package/src/components/parammanage/ParamPage.vue

@@ -267,7 +267,7 @@
         } else if (type === 't_paramvalue') {
           this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              this.$resetpost('rs/logic/safeParamvalueDelete', {id: row.id}).then((res) => {
+              this.$resetpost('rs/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
                 this.getParamValue(this.selectItem)
               })
             }

package/src/components/parammanage/ParamPages.vue

@@ -113,7 +113,7 @@
     methods: {
       // 加载全部参数
       loadParams () {
-        this.$refs.paramsLoad.load('rs/sql/safeParameterQuery').then((res) => {
+        this.$refs.paramsLoad.load('rs/sql/hql/simpleHql', {data: {tablename: 't_parameter'}}).then((res) => {
           this.model.rows = this.allParams = res.data
         })
       },
@@ -159,7 +159,7 @@
         } else if (row.EntityType === 't_paramvalue') {
           this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              this.$refs.selectsLoad.load('rs/logic/safeParamvalueDelete', {id: row.id}).then((res) => {
+              this.$refs.selectsLoad.load('rs/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
                 this.params.rows.splice(index, 1)
               })
             }

package/src/components/parammanage/SinglePage.vue

@@ -183,7 +183,7 @@
       deleteItem (row) {
         this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
-            this.$resetpost('rs/logic/safeSinglevalueDelete', {id: row.id}).then((res) => {
+            this.$resetpost('rs/logic/deleteValue', {tablename: 't_singlevalue', id: row.id}).then((res) => {
               this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
             })
           }

package/src/components/parammanage/SinglePages.vue

@@ -95,14 +95,14 @@
     },
     methods: {
       loadSingle () {
-        this.$refs.singleLoad.load('rs/sql/safeSinglevalueQuery', {data: {condition: '1=1'}}).then((res) => {
+        this.$refs.singleLoad.load('rs/sql/singleTable', {data: {tablename: 't_singlevalue', condition: '1=1'}}).then((res) => {
           this.model.rows = this.params = res.data
         })
       },
       deleteItem (row) {
         this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
-            this.$refs.singleLoad.load('rs/logic/safeSinglevalueDelete', {id: row.id}).then((res) => {
+            this.$refs.singleLoad.load('rs/logic/deleteValue', {tablename: 't_singlevalue', id: row.id}).then((res) => {
               this.loadSingle()
             })
           }

package/src/components/server/AddChangeMsg.vue

@@ -48,11 +48,10 @@ export default {
     },
     confirm () {
       let param = {
-        f_change_name: this.model.f_change_name,
-        f_change_message: this.model.f_change_message,
-        f_change_date: new Date().format('yyyy-MM-dd HH:mm:ss')
+        tablename: 't_changedeclare',
+        parameters: this.model
       }
-      this.$post('rs/logic/safeChangedeclareSave', param)
+      this.$post('rs/logic/save', {data: param})
       .then(() => {
         this.model = {}
         this.$emit('toggle')

package/src/components/server/ChangeDeclare.vue

@@ -22,8 +22,15 @@ export default {
     }
   },
   ready () {
-    this.$info(`加载数据中...`)
-    this.$refs.pv.load('rs/sql/safeChangedeclareQuery',{data:{condition:'f_change_message is not null'}}).then((a) => {
+    let sql = 'singleTable_OrderBy'
+    let condition = {
+      items: 'id,f_change_name,f_change_message,f_change_date',
+      tablename: 't_changedeclare',
+      condition: ' 1=1',
+      orderitem: 'f_change_date DESC'
+    }
+    this.$info(`加载数据中..., sql:${sql}`)
+    this.$refs.pv.load('rs/sql/singleTable_OrderBy', {data: condition}).then((a) => {
       this.$info(`成功获取到数据！, data:${JSON.stringify(a.data)}`)
       this.model = a.data
     }).catch((error) => {

package/src/components/server/Login.vue

@@ -146,6 +146,7 @@ import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
 import {isPasswordModificationExpired} from '../Util'
+import { isStrongPassword } from '../../util/password-validation'
 
 let daibanJson = require('../../util/Daiban.json')
 
@@ -193,7 +194,7 @@ let saveGen = function *(self) {
     }
     console.log(self.$login.depPrompt)
     // 弱口令验证（默认开启，跳转过来的不进行验证）
-    if ((!self.otherLogin) && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(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
       })
@@ -347,20 +348,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', {f_orgid: this.$login.f.orgid}, {
-        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)
       })
@@ -368,6 +370,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: {
@@ -389,6 +392,7 @@ export default {
         this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
       }
     })
+
     },
     async getDaiBanA(){
       // 是否全局开启待办通知

package/src/components/server/ModifyPw.vue

@@ -1,72 +1,72 @@
 <template>
   <div>
     <validator name="v">
-      <modal :show.sync="show" v-ref:modal  backdrop="false">
+      <modal :show.sync="show" v-ref:modal backdrop="false">
         <header slot="modal-header" class="modal-header">
           <button type="button" class="close" @click="rest"><span>&times;</span></button>
           <h4 class="modal-title">修改密码</h4>
         </header>
         <article slot="modal-body" class="modal-body modifystyle auto form-horizontal">
+          <div class="password-alert">
+            {{ passwordRuleHint }}
+          </div>
           <div class="has-feedback form-group"
                :class="{'has-warning':$v.password.required,'has-error': $v.password.required,
           'has-success':!$v.password.required}">
-            <label for="password" class="col-sm-4 col-sm-offset-1 control-label">原始密码:&nbsp;&nbsp;</label>
-            <div class="col-sm-4">
+            <label for="password" class="col-sm-3 control-label">原始密码</label>
+            <div class="col-sm-8 password-field-wrap">
               <input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true}">
               <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required"></span>
-              <span v-if="$v.password.required">不能为空</span>
+              <span class="field-error" v-if="$v.password.required">不能为空</span>
             </div>
           </div>
           <div class="has-feedback form-group"
-               :class="{'has-warning':$v.newpassword.required,'has-error':($v.newpassword.numbersAndLetter8to16 || $v.newpassword.minlength)&& !$v.newpassword.required && !$v.newpassword.chinesePassword,
-          'has-success': !$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16&&!$v.newpassword.minlength  && !$v.newpassword.chinesePassword}">
-            <label for="newpassword" class="col-sm-4 col-sm-offset-1 control-label">新的密码:&nbsp;&nbsp;</label>
-            <div class="col-sm-4">
-              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, numbersAndLetter8to16: true, minlength: 6,chinesePassword: true}'>
-              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.minlength && !($v.newpassword.numbersAndLetter8to16 && !($v.newpassword.required)) && !($v.newpassword.chinesePassword) "></span>
-              <span v-if="$v.newpassword.required">不能为空</span>
-              <span v-if="($v.newpassword.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与大小字母外加特殊字符的组合，并且不能出现类似'123','abc'等连贯数字或者字母</span>
-              <span v-if="$v.newpassword.chinesePassword">密码不能包含中文</span>
+               :class="{'has-warning':$v.newpassword.required,'has-error':($v.newpassword.numbersAndLetter8to16 || $v.newpassword.chinesePassword) && !$v.newpassword.required,
+          'has-success': !$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16 && !$v.newpassword.chinesePassword}">
+            <label for="newpassword" class="col-sm-3 control-label">新的密码</label>
+            <div class="col-sm-8 password-field-wrap">
+              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, numbersAndLetter8to16: true, chinesePassword: true}'>
+              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16 && !$v.newpassword.chinesePassword"></span>
+              <span class="field-error" v-if="$v.newpassword.required">不能为空</span>
+              <span class="field-error" v-if="$v.newpassword.chinesePassword && !$v.newpassword.required">密码不能包含中文</span>
+              <div v-if="passwordStrength.visible" class="password-strength">
+                <span class="strength-label">密码强度</span>
+                <span class="strength-tag" :class="passwordStrength.type">{{ passwordStrength.label }}</span>
+                <span class="strength-desc">{{ passwordStrength.desc }}</span>
+              </div>
             </div>
           </div>
           <div class="has-feedback form-group"
                :class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
           'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
-            <label for="affirmpassword" class="col-sm-4 col-sm-offset-1 control-label">确认密码:&nbsp;&nbsp;</label>
-            <div class="col-sm-4">
+            <label for="affirmpassword" class="col-sm-3 control-label">确认密码</label>
+            <div class="col-sm-8 password-field-wrap">
               <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.newpassword }">
               <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
-              <span v-if="$v.affirmpassword.required">不能为空</span>
-              <span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
+              <span class="field-error" v-if="$v.affirmpassword.required">不能为空</span>
+              <span class="field-error" v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致</span>
             </div>
           </div>
         </article>
 
         <footer slot="modal-footer" class="modal-footer">
-          <button  type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
-          <button  type="button" class="btn btn-default" @click='rest'>取消</button>
+          <button type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
+          <button type="button" class="btn btn-default" @click='rest'>取消</button>
         </footer>
       </modal>
     </validator>
   </div>
-
-
 </template>
 <script>
   import co from 'co'
-  import validator from '../../plugins/validation';
+  import validator from '../../plugins/validation'
+  import { getPasswordStrength, PASSWORD_RULE_HINT } from '../../util/password-validation'
 
   let saveGen = function * (self) {
     self.deliver.ename = self.functions.ename
-    // let res = yield self.$post('rs/user/entity', {data: self.deliver})
-    // 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
     let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver }, {resolveMsg: null,rejectMsg: null})
     self.$login.f.password = self.deliver.newpassword
     if (res.data) {
-      console.log("修改密码返回：" , res.data)
-      // 兼容旧版ldao，旧版不返回code
       if (res.data.code === 200) {
         self.deliver.password = ''
         self.deliver.newpassword = ''
@@ -74,7 +74,6 @@
         self.show = false
         self.$showAlert("修改密码成功", 'success', 2000)
       } else {
-        // 兼容旧版ldao，旧版不返回code
         self.deliver.password = ''
         self.deliver.newpassword = ''
         self.deliver.affirmpassword = ''
@@ -98,7 +97,13 @@
           newpassword: '',
           affirmpassword: ''
         },
-        functions: this.$login.f
+        functions: this.$login.f,
+        passwordRuleHint: PASSWORD_RULE_HINT
+      }
+    },
+    computed: {
+      passwordStrength () {
+        return getPasswordStrength(this.deliver.newpassword)
       }
     },
     props: ['show'],
@@ -115,11 +120,77 @@
   }
 </script>
 <style>
-  /*修改密码body界面样式*/
   .modifystyle {
-    background: #FCFEEE;
+    background: #fff;
+    padding: 10px 20px 20px;
+  }
+
+  .modifystyle .control-label {
+    color: #333;
+    font-weight: normal;
+    padding-top: 7px;
+  }
+
+  .password-field-wrap {
+    padding-left: 0;
+    padding-right: 0;
+  }
+
+  .password-field-wrap .form-control {
+    width: 100%;
+  }
+
+  .password-alert {
+    margin: 0 0 16px;
+    padding: 10px 12px;
+    border-radius: 4px;
+    background: #f5f7fa;
+    border: 1px solid #e4e7ed;
+    color: #606266;
+    font-size: 13px;
+    line-height: 1.6;
   }
-  .modifystyle span{
-    color: red;
+
+  .field-error {
+    display: block;
+    margin-top: 6px;
+    color: #e74c3c;
+    font-size: 12px;
+    line-height: 1.4;
+  }
+
+  .password-strength {
+    margin-top: 8px;
+    font-size: 12px;
+    line-height: 1.6;
+    color: #606266;
+  }
+
+  .password-strength .strength-label {
+    margin-right: 6px;
+    color: #909399;
+  }
+
+  .password-strength .strength-tag {
+    display: inline-block;
+    margin-right: 8px;
+    padding: 1px 8px;
+    border-radius: 3px;
+    font-size: 12px;
+    line-height: 1.5;
+  }
+
+  .password-strength .strength-tag.success {
+    color: #2e7d32;
+    background: #e8f5e9;
+  }
+
+  .password-strength .strength-tag.error {
+    color: #c62828;
+    background: #ffebee;
+  }
+
+  .password-strength .strength-desc {
+    color: #606266;
   }
 </style>

package/src/components/server/PcdBuildingSelect.vue

@@ -66,20 +66,41 @@
     self.arrays.pcd=[{label:'全部',value:''}]
     if(self.show.pcdShow){
       let HttpReset = new HttpResetClass()
-      var pcd = await HttpReset.load('POST', 'rs/sql/safePcdQuery', {}, {resolveMsg: null, rejectMsg: '获取省市区出错!'})
+      var pcd = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
+        data: {
+          items: 'f_pcd',
+          tablename: 't_pcd',
+          condition: `f_pcd is not null group by f_pcd`,
+          orderitem: 'f_pcd'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取省市区出错!'})
       for(var i=0;i<pcd.data.length;i++){
         self.arrays.pcd.push({label:pcd.data[i].f_pcd,value:pcd.data[i].f_pcd})
       }
     }else if(self.show.streetShow){
       console.log("------------查街道")
       let HttpReset = new HttpResetClass()
-      var street = await HttpReset.load('POST', 'rs/sql/safeStreetQueryByFiliale', {f_filialeid: self.$login.f.orgid}, {resolveMsg: null, rejectMsg: '获取街道出错!'})
+      var street = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
+        data: {
+          items: 'f_street',
+          tablename: 't_street',
+          condition: `f_filialeid = '${self.$login.f.orgid}' and f_street is not null group by f_street`,
+          orderitem: 'f_street'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取街道出错!'})
       for(var i=0;i<street.data.length;i++){
         self.arrays.street.push({label:street.data[i].f_street,value:street.data[i].f_street})
       }
     }else if(self.show.areaShow){
       let HttpReset = new HttpResetClass()
-      var area = await HttpReset.load('POST', 'rs/sql/safeAreaQueryByFiliale', {f_filialeid: self.$login.f.orgid}, {resolveMsg: null, rejectMsg: '获取小区出错!'})
+      var area = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
+        data: {
+          items: 'f_residential_area',
+          tablename: 't_area',
+          condition: `f_filialeid = '${self.$login.f.orgid}' and f_residential_area is not null group by f_residential_area`,
+          orderitem: 'f_residential_area'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取小区出错!'})
       for(var i=0;i<area.data.length;i++){
         self.arrays.area.push({label:area.data[i].f_residential_area,value:area.data[i].f_residential_area})
       }
@@ -133,7 +154,15 @@
     methods:{
       async pcdChange(){
         this.arrays.street=[{label:'全部',value:''}]
-        let street = await this.$resetpost('rs/sql/safeStreetQueryByFiliale', {f_filialeid: this.$login.f.orgid}, {resolveMsg: null, rejectMsg: '获取街道出错'})
+        var condition = `f_filialeid = '${this.$login.f.orgid}' and f_street is not null group by f_street`
+        let street = await this.$resetpost('rs/sql/singleTable_OrderBy', {
+          data: {
+            items: 'f_street',
+            tablename: 't_street',
+            condition: condition,
+            orderitem: 'f_street'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取街道出错'})
         for(var i=0;i<street.data.length;i++){
           this.arrays.street.push({label:street.data[i].f_street,value:street.data[i].f_street})
         }
@@ -141,7 +170,15 @@
       },
       async streetChange(){
         this.arrays.area=[{label:'全部',value:''}]
-        let area = await this.$resetpost('rs/sql/safeAreaQueryByStreet', {f_street: this.model.f_street}, {resolveMsg: null, rejectMsg: '获取小区出错'})
+        var condition = `f_street = '${this.model.f_street?this.model.f_street:null}' and f_residential_area is not null group by f_residential_area`
+        let area = await this.$resetpost('rs/sql/singleTable_OrderBy', {
+          data: {
+            items: 'f_residential_area',
+            tablename: 't_area',
+            condition: condition,
+            orderitem: 'f_residential_area'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区出错'})
         for(var i=0;i<area.data.length;i++){
           this.arrays.area.push({label:area.data[i].f_residential_area,value:area.data[i].f_residential_area})
         }
@@ -149,12 +186,20 @@
       },
       async areaChange(){
         this.building = [{label:'全部',value:''}]
-        let build
+        var condition=''
         if(this.show.areaShow){
-          build = await this.$resetpost('rs/sql/safeBuildingQueryByArea', {f_residential_area: this.model.f_residential_area}, {resolveMsg: null, rejectMsg: '获取楼栋出错'})
+          condition = `f_residential_area = '${this.model.f_residential_area?this.model.f_residential_area:null}' and f_building is not null group by f_building`
         }else{
-          build = await this.$resetpost('rs/sql/safeBuildingQueryByFiliale', {f_filialeid: this.$login.f.orgid}, {resolveMsg: null, rejectMsg: '获取楼栋出错'})
+          condition = `f_filialeid = '${this.$login.f.orgid}' and f_building is not null group by f_building`
         }
+        let build = await this.$resetpost('rs/sql/singleTable_OrderBy', {
+          data: {
+            items: 'f_building',
+            tablename: 't_user_address',
+            condition: condition,
+            orderitem: 'f_building'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取楼栋出错'})
         for(var i=0;i<build.data.length;i++){
           this.arrays.building.push({label:build.data[i].f_building,value:build.data[i].f_building})
         }

package/src/filiale/baole/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) && !(/^(?![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
       })
@@ -361,20 +362,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)
       })
@@ -382,6 +384,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: {
@@ -403,6 +406,7 @@ export default {
         this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
       }
     })
+
     },
     async getDaiBanA(){
       // 是否全局开启待办通知