system-clients 3.2.1-29 → 3.2.1-32

package/src/components/equipment/PosParamList.vue

@@ -1,121 +1,121 @@
-<template>
-  <div class="flex">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' style="background-color: white" @condition-changed='$parent.selfSearch' v-ref:cri>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-          <div class="row">
-            <div class="col-sm-3  form-group">
-              <label class="font_normal_body">公&nbsp;&nbsp;&nbsp;司</label>
-              <res-select restype='organization'
-                          :is-mul="false"
-                          @res-select="$parent.$parent.getorg"
-                          :initresid="$parent.$parent.curorgid">
-              </res-select>
-            </div>
-            <div class="col-sm-3  form-group">
-              <label class="font_normal_body">参数名称</label>
-              <input type="text" class="input_search" style="width:60%" v-model="model.f_param_name"
-                     condition="name like '%{}%'" placeholder="参数名称">
-            </div>
-            <div class="span" style="float:right;margin-top: 6px">
-              <button type="button" class="button_search" @click="search()" v-el:cx>查询</button>
-              <button type="button" class="button_search" @click="$parent.$parent.add() " v-el:cx>新增</button>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th style="text-align:center;white-space:nowrap;">参数id</th>
-            <th style="text-align:center;white-space:nowrap;">参数名称</th>
-            <th style="text-align:center;white-space:nowrap;">所属分公司</th>
-            <th style="text-align:center;white-space:nowrap;">所属银行</th>
-            <th style="text-align:center;white-space:nowrap;">创建人</th>
-            <th style="text-align:center;white-space:nowrap;">操作</th>
-          </tr>
-        </template>
-        <template partial='body' :model="model">
-          <tr>
-            <td style="text-align:center;white-space:nowrap;">{{ row.f_param_id }}</td>
-            <td style="text-align:center;white-space:nowrap;">{{ row.name }}</td>
-            <td style="text-align:center;white-space:nowrap;">{{ row.f_orgname }}</td>
-            <td style="text-align:center;white-space:nowrap;">{{ row.f_bank_name }}</td>
-            <td style="text-align:center;white-space:nowrap;">{{ row.f_operator }}</td>
-            <td style="text-align:center;white-space:nowrap;">
-              <div class="col-sm-1"></div>
-              <div class="col-sm-4">
-                <button type="button" class="btn button_new" v-if="!row.sum||row.sum ===0 "
-                        @click.stop="$parent.$parent.$parent.delete(row)">删除
-                </button>
-              </div>
-              <div class="col-sm-1"></div>
-              <div class="col-sm-4">
-                <button type="button" class="btn button_new"
-                        @click.stop="$parent.$parent.$parent.modify(row)">修改
-                </button>
-              </div>
-              <div class="col-sm-1"></div>
-            </td>
-          </tr>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-
-import {PagedList} from 'vue-client'
-
-export default {
-  title: '终端控制',
-  components: {},
-  data() {
-    return {
-      model: new PagedList('rs/sql/get_posParam', 20),
-      curorgid: [this.f_filialeid],
-    }
-  },
-  props: [],
-  ready() {
-    this.search()
-  },
-  watch: {},
-  methods: {
-    getRes(val) {
-      if (val.orgobj.length === 1 && val.orgobj[0].resourcetype === 'user') {
-        this.$refs.paged.$refs.cri.model.f_user_operatorid = val.orgobj[0].userid
-        this.$refs.paged.$refs.cri.model.f_user_operator = val.orgobj[0].name
-      } else {
-        this.$refs.paged.$refs.cri.model.f_user_operatorid = ''
-        this.$refs.paged.$refs.cri.model.f_user_operator = ''
-      }
-    },
-    async delete(row) {
-      await this.$resetpost('rs/logic/deletePosParam', {data: row}, {rejectMsg: null, resolveMsg: null})
-      await this.search()
-    },
-    modify(row) {
-      this.$dispatch('modify', row)
-    },
-    search() {
-      this.$refs.paged.$refs.cri.search()
-    },
-    selfSearch(args) {
-      if (this.f_orgid) {
-        args.condition += ` and f_orgid = ${this.f_orgid} `
-      }
-      this.model.search(args.condition, this.model)
-    },
-    add() {
-      this.$dispatch('add', this.f_filialeid)
-    },
-    getorg(val) {
-      this.f_orgid = val[0]
-      this.f_filialeid = val[0]
-    }
-  },
-  computed: {}
-}
-</script>
+<template>
+  <div class="flex">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' style="background-color: white" @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="col-sm-3  form-group">
+              <label class="font_normal_body">公&nbsp;&nbsp;&nbsp;司</label>
+              <res-select restype='organization'
+                          :is-mul="false"
+                          @res-select="$parent.$parent.getorg"
+                          :initresid="$parent.$parent.curorgid">
+              </res-select>
+            </div>
+            <div class="col-sm-3  form-group">
+              <label class="font_normal_body">参数名称</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_param_name"
+                     condition="name like '%{}%'" placeholder="参数名称">
+            </div>
+            <div class="span" style="float:right;margin-top: 6px">
+              <button type="button" class="button_search" @click="search()" v-el:cx>查询</button>
+              <button type="button" class="button_search" @click="$parent.$parent.add() " v-el:cx>新增</button>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th style="text-align:center;white-space:nowrap;">参数id</th>
+            <th style="text-align:center;white-space:nowrap;">参数名称</th>
+            <th style="text-align:center;white-space:nowrap;">所属分公司</th>
+            <th style="text-align:center;white-space:nowrap;">所属银行</th>
+            <th style="text-align:center;white-space:nowrap;">创建人</th>
+            <th style="text-align:center;white-space:nowrap;">操作</th>
+          </tr>
+        </template>
+        <template partial='body' :model="model">
+          <tr>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_param_id }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.name }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_orgname }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_bank_name }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_operator }}</td>
+            <td style="text-align:center;white-space:nowrap;">
+              <div class="col-sm-1"></div>
+              <div class="col-sm-4">
+                <button type="button" class="btn button_new" v-if="!row.sum||row.sum ===0 "
+                        @click.stop="$parent.$parent.$parent.delete(row)">删除
+                </button>
+              </div>
+              <div class="col-sm-1"></div>
+              <div class="col-sm-4">
+                <button type="button" class="btn button_new"
+                        @click.stop="$parent.$parent.$parent.modify(row)">修改
+                </button>
+              </div>
+              <div class="col-sm-1"></div>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+
+import {PagedList} from 'vue-client'
+
+export default {
+  title: '终端控制',
+  components: {},
+  data() {
+    return {
+      model: new PagedList('rs/sql/get_posParam', 20),
+      curorgid: [this.f_filialeid],
+    }
+  },
+  props: [],
+  ready() {
+    this.search()
+  },
+  watch: {},
+  methods: {
+    getRes(val) {
+      if (val.orgobj.length === 1 && val.orgobj[0].resourcetype === 'user') {
+        this.$refs.paged.$refs.cri.model.f_user_operatorid = val.orgobj[0].userid
+        this.$refs.paged.$refs.cri.model.f_user_operator = val.orgobj[0].name
+      } else {
+        this.$refs.paged.$refs.cri.model.f_user_operatorid = ''
+        this.$refs.paged.$refs.cri.model.f_user_operator = ''
+      }
+    },
+    async delete(row) {
+      await this.$resetpost('rs/logic/deletePosParam', {data: row}, {rejectMsg: null, resolveMsg: null})
+      await this.search()
+    },
+    modify(row) {
+      this.$dispatch('modify', row)
+    },
+    search() {
+      this.$refs.paged.$refs.cri.search()
+    },
+    selfSearch(args) {
+      if (this.f_orgid) {
+        args.condition += ` and f_orgid = ${this.f_orgid} `
+      }
+      this.model.search(args.condition, this.model)
+    },
+    add() {
+      this.$dispatch('add', this.f_filialeid)
+    },
+    getorg(val) {
+      this.f_orgid = val[0]
+      this.f_filialeid = val[0]
+    }
+  },
+  computed: {}
+}
+</script>

package/src/components/equipment/PosParamManage.vue

@@ -1,51 +1,51 @@
-<template>
-  <div class="flex-row">
-    <div :class="{'basic-main':!isChange,'binary-left':isChange}">
-      <pos-param-list v-ref:list></pos-param-list>
-    </div>
-    <div class="binary-right" style="margin-left: 10px; width: 40%;" v-if="isChange">
-      <pos-param-add :param_id="param_id" v-ref:add></pos-param-add>
-    </div>
-  </div>
-</template>
-<script>
-
-import PosParamList from './PosParamList'
-import PosParamAdd from './PosParamAdd'
-
-export default {
-  title: 'POS终端管理',
-  components: {
-    PosParamList, PosParamAdd
-  },
-  data() {
-    return {
-      isChange: false,
-      param_id: ''
-    }
-  },
-  methods: {},
-  events: {
-    'add'() {
-      this.isChange = true
-      setTimeout(() => {
-        this.$refs.add.initModel()
-      }, 100)
-    },
-    'close'() {
-      this.isChange = false
-    },
-    'research'() {
-      this.$refs.list.search()
-      this.isChange = false
-    },
-    'modify'(row) {
-      this.isChange = true
-      setTimeout(() => {
-        this.$refs.add.curorgid = []
-        this.$refs.add.edit(row.f_param_id)
-      }, 100)
-    }
-  }
-}
-</script>
+<template>
+  <div class="flex-row">
+    <div :class="{'basic-main':!isChange,'binary-left':isChange}">
+      <pos-param-list v-ref:list></pos-param-list>
+    </div>
+    <div class="binary-right" style="margin-left: 10px; width: 40%;" v-if="isChange">
+      <pos-param-add :param_id="param_id" v-ref:add></pos-param-add>
+    </div>
+  </div>
+</template>
+<script>
+
+import PosParamList from './PosParamList'
+import PosParamAdd from './PosParamAdd'
+
+export default {
+  title: 'POS终端管理',
+  components: {
+    PosParamList, PosParamAdd
+  },
+  data() {
+    return {
+      isChange: false,
+      param_id: ''
+    }
+  },
+  methods: {},
+  events: {
+    'add'() {
+      this.isChange = true
+      setTimeout(() => {
+        this.$refs.add.initModel()
+      }, 100)
+    },
+    'close'() {
+      this.isChange = false
+    },
+    'research'() {
+      this.$refs.list.search()
+      this.isChange = false
+    },
+    'modify'(row) {
+      this.isChange = true
+      setTimeout(() => {
+        this.$refs.add.curorgid = []
+        this.$refs.add.edit(row.f_param_id)
+      }, 100)
+    }
+  }
+}
+</script>

package/src/components/server/LoadData.vue

@@ -1,55 +1,55 @@
-<template>
-  <div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
-    <!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
-    <h2 style="margin: 0" v-if="show">参数加载失败，请检查网络状态和服务状态...</h2>
-  </div>
-</template>
-
-<script>
-  export default {
-    title: '加载参数',
-    data () {
-      return {
-        msg: '',
-        show: false
-      }
-    },
-    props: {
-      componentName: {}
-    },
-    async ready () {
-      this.$nextTick(() => {
-        window.addEventListener('message', messageEvent => {
-          try {
-            const data = messageEvent.data
-            console.log('接收到数据', data)
-            this.$login = Object.assign(this.$login, data.login)
-            this.$appdata = Object.assign(this.$appdata, data.appdata)
-            if (!data.page) {
-              this.$showMessage('没有功能连接, 请配置!')
-              return
-            }
-            this.$goto(data.page)
-          } catch (e) {
-            console.log('登陆异常', e)
-          }
-        })
-      })
-    }
-  }
-</script>
-<style media="screen">
-  .loadingdata {
-    position: fixed;
-    background: #fff;
-    opacity: 0.6;
-    top: 0;
-    width: 100%;
-  }
-  .loaderror {
-    opacity: 1;
-  }
-  .loadsuccess {
-    display: none;
-  }
-</style>
+<template>
+  <div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
+    <!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
+    <h2 style="margin: 0" v-if="show">参数加载失败，请检查网络状态和服务状态...</h2>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: '加载参数',
+    data () {
+      return {
+        msg: '',
+        show: false
+      }
+    },
+    props: {
+      componentName: {}
+    },
+    async ready () {
+      this.$nextTick(() => {
+        window.addEventListener('message', messageEvent => {
+          try {
+            const data = messageEvent.data
+            console.log('接收到数据', data)
+            this.$login = Object.assign(this.$login, data.login)
+            this.$appdata = Object.assign(this.$appdata, data.appdata)
+            if (!data.page) {
+              this.$showMessage('没有功能连接, 请配置!')
+              return
+            }
+            this.$goto(data.page)
+          } catch (e) {
+            console.log('登陆异常', e)
+          }
+        })
+      })
+    }
+  }
+</script>
+<style media="screen">
+  .loadingdata {
+    position: fixed;
+    background: #fff;
+    opacity: 0.6;
+    top: 0;
+    width: 100%;
+  }
+  .loaderror {
+    opacity: 1;
+  }
+  .loadsuccess {
+    display: none;
+  }
+</style>

package/src/components/server/Login.vue

@@ -193,7 +193,7 @@ let saveGen = function *(self) {
     console.log(self.$login.depPrompt)
     // 弱口令验证
     //跳转过来的不进行验证
-    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(self.model.password))) {
+    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })
@@ -320,10 +320,15 @@ export default {
   methods: {
     async getDaiBan(){
       let http = new HttpResetClass()
+      let condition = ''
+      if(this.$login.f.deps!=='柠条塔'){
+        condition = ` f_orderstate != '预约成功'  and ( f_orderstate != '预约失败'  or f_orderstate is null ) `
+      } else {
+        condition =` f_orderstate != '预约成功' and f_depname ='${this.$login.f.deps}' and ( f_orderstate != '预约失败'  or f_orderstate is null ) `
+      }
       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 ) `
-
+          condition:condition
         }}, {
         resolveMsg: null,
         rejectMsg: null
@@ -351,14 +356,14 @@ export default {
       }).then((res) => {
         let AppDaiBan = {}
         res.data.forEach(item=>{
-          AppDaiBan[item.defname] = AppDaiBan[item.defname] || []
-          AppDaiBan[item.defname].push(item)
-        })
-        this.AppDaiBan = `您有${res.data.length}条需要处理的报建待办业务！`
-        if (res.data.length> 0){
-          this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
-        }
+        AppDaiBan[item.defname] = AppDaiBan[item.defname] || []
+        AppDaiBan[item.defname].push(item)
       })
+      this.AppDaiBan = `您有${res.data.length}条需要处理的报建待办业务！`
+      if (res.data.length> 0){
+        this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
+      }
+    })
 
     },
     async loginother(){