system-clients 3.2.82 → 3.2.83-yangchun

package/src/components/parammanage/ParamPage.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex">
     <p class="bg-info text-center" style="padding: 8px;">参数管理
-      <button type="button" name="button" class="button_search button_spacing width-60" @click="add('t_parameter')" style="float:right">新增</button>
+      <button type="button" name="button" class="button_search button_spacing width-60" @click="add('t_parameter')" style="float:right" v-if="this.$login.r.includes('参数管理新增')">新增</button>
     </p>
     <div class="auto">
       <form class="form-horizontal" style="margin-bottom: 5px;">
@@ -40,9 +40,9 @@
           <td style="text-align:center">{{row.orgname ? row.orgname + '专用' : '全局'}}</td>
           <td class="flex-around">
             <button type="button" name="button" class="button_search button_spacing width-60"
-                    @click.stop="$parent.$parent.modifyParam(row, 't_parameter')">修改</button>
+                    @click.stop="$parent.$parent.modifyParam(row, 't_parameter')" v-if="this.$login.r.includes('参数管理修改')">修改</button>
             <button type="button" name="button" class="btn btn-danger"
-                    @click.stop="$parent.$parent.deleteParam(row, 't_parameter')">删除</button>
+                    @click.stop="$parent.$parent.deleteParam(row, 't_parameter')" v-if="this.$login.r.includes('参数管理删除')">删除</button>
           </td>
         </template>
       </data-grid>
@@ -50,7 +50,7 @@
 
     <p v-if="selectItem" class="bg-info text-center" style="padding: 8px;margin: 8px 0px;">
       {{selectItem.name}}
-      <button type="button" name="button" class="button_search button_spacing width-60" @click="add('t_paramvalue')" style="float:right">新增</button>
+      <button type="button" name="button" class="button_search button_spacing width-60" @click="add('t_paramvalue')" style="float:right" v-if="this.$login.r.includes('参数管理二级新增')">新增</button>
     </p>
     <div v-if="selectItem" class="span">
       <data-grid :model="params" v-ref:selects >
@@ -65,9 +65,9 @@
           <td style="text-align:center">{{$index+1}}</td>
           <td style="text-align:center">{{row.name}}</td>
           <td class="flex-around col-sm-3">
-            <button type="button" name="button" class="button_search" @click.stop="$parent.$parent.modifyParam(row, 't_paramvalue')">修改</button>
-            <button type="button" name="button" class="button_search" v-if="$index!=0" @click.stop="$parent.$parent.move(row,$index)">上移</button>
-            <button type="button" name="button" class="btn btn-danger" @click.stop="$parent.$parent.deleteParam(row, 't_paramvalue')">删除</button>
+            <button type="button" name="button" class="button_search" v-if="this.$login.r.includes('参数管理二级修改')" @click.stop="$parent.$parent.modifyParam(row, 't_paramvalue')">修改</button>
+            <button type="button" name="button" class="button_search" v-if="$index != 0 && $login.r.includes('参数管理二级排序')" @click.stop="$parent.$parent.move(row,$index)">上移</button>
+            <button type="button" name="button" class="btn btn-danger" v-if="this.$login.r.includes('参数管理二级删除')" @click.stop="$parent.$parent.deleteParam(row, 't_paramvalue')">删除</button>
           </td>
         </template>
       </data-grid>

package/src/components/parammanage/SinglePage.vue

@@ -2,7 +2,7 @@
   <div class="flex">
     <p  class="bg-info text-center" style="padding: 8px;">
       单值管理
-      <button type="button" name="button" class="button_search button_spacing width-60 " @click="add()" style="float:right">新增</button>
+      <button type="button" name="button" class="button_search button_spacing width-60 " @click="add()" style="float:right" v-if="this.$login.r.includes('单值管理新增')">新增</button>
     </p>
     <div class="auto">
       <form class="form-horizontal" style="margin-bottom: 5px;">
@@ -44,9 +44,9 @@
             <td style="text-align:center">{{row.orgname ? row.orgname + '专用' : '全局'}}</td>
             <td class="flex-around">
               <button type="button" name="button" class="button_search button_spacing width-60"
-                      @click.stop="$parent.$parent.$parent.modifyParam(row)">修改</button>
+                      @click.stop="$parent.$parent.$parent.modifyParam(row)" v-if="this.$login.r.includes('单值管理修改')">修改</button>
               <button type="button" name="button" class="btn btn-danger"
-                      @click.stop="$parent.$parent.$parent.deleteItem(row)">删除</button>
+                      @click.stop="$parent.$parent.$parent.deleteItem(row)" v-if="this.$login.r.includes('单值管理删除')">删除</button>
             </td>
           </template>
         </data-grid>

package/src/components/server/Login.vue

@@ -8,7 +8,7 @@
             <img
               src="../../assets/clear-cookie.png" style="height: 25px; width: 95px;margin-bottom: 3px;">
           </button>
-          <span v-if="$login.versionTime">>构建时间：{{ vTime }}</span>
+          <span v-if="$login.versionTime">构建时间：{{ vTime }}</span>
           <div v-if="titleShow">
           <img src="../../../static/newStyle/login-info.png"/>
           <span @click="showus=true">关于我们</span>
@@ -85,7 +85,7 @@
       技术支持：西安奥枫软件有限公司
     </div>
     <div class="login-foot" v-show="$login.BAinformation">
-      {{ $login.BAinformation }}
+      {{{ $login.BAinformation }}}
     </div>
 
     <modal v-if="depPromptShow" :show.sync="depPromptShow" :backdrop="false" v-ref:modal >
@@ -205,7 +205,7 @@ 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) && self.config.weakPassword && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(self.model.password))) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })
@@ -314,6 +314,8 @@ export default {
         msgRole : '预约处理人员',
         // 定时获取提示间隔 单位：分钟
         times: 25,
+        approve: false, // 是否获取审核提醒
+        approveTimes: 1 // 审核时间见间隔
       },
       titleShow: true, //标题显示
       otherLogin:false,

package/src/components/server/ModifyPw.vue

@@ -25,7 +25,7 @@
               <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位数字与字母组合</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>
             </div>
           </div>

package/src/components/server/ResSelect.vue

@@ -18,6 +18,11 @@
 
       //资源类型
       restype:'',
+      //是否只查询营业厅
+      specialquery: {
+        type: Boolean,
+        default: false
+      },
       //资源数据
       resObj:{},
       isMul: {
@@ -83,7 +88,13 @@
             parentname=parentname.replace("组织机构","")
             this.resoptions.push({label: val.name+' - '+parentname, value: val.id})
           }else{
-            this.resoptions.push({label: val.name, value: val.id})
+            if (this.specialquery && this.restype == 'department') {
+              if (val.f_dep_type === '营业厅') {
+                this.resoptions.push({label: val.name, value: val.id})
+              }
+            }else {
+              this.resoptions.push({label: val.name, value: val.id})
+            }
           }
         }
       },

package/src/components/server/ResSelectGroup.vue

@@ -10,6 +10,7 @@
     <res-select restype='department' v-ref:department
                 @res-select="getdep"
                 :parentresid="depresid"
+                :specialquery="specialquery"
                 :initresid='initres.dep'
                 :mustselect="mustselect"
                 :is-mul="mul">
@@ -57,6 +58,11 @@ export default {
       type: Boolean,
       default: true
     },
+    //是否只查询营业厅
+    specialquery: {
+      type: Boolean,
+      default: false
+    },
     //初始值
     initres: {
       type: Object,

package/src/components/server/RightTree.vue

@@ -209,7 +209,7 @@ export default {
     },
     //点击资源的方法
     selectclick (row) {
-      if(this.orgids==row.id){
+      if(row == undefined || this.orgids==row.id){
         //取消点击
         this.orgnames="请选择"
         this.orgids=null