system-clients 3.2.82 → 3.2.83

package/src/components/equipment/EquipmentManage.vue

@@ -17,19 +17,21 @@
       </div>
     </div>
     <div v-if="model.f_equipment_type[0] === 'PC'">
-      <pc-manage></pc-manage>
+      <pc-manage :users="users"></pc-manage>
     </div>
     <div v-if="model.f_equipment_type[0] === 'POS'">
       <pos-manage></pos-manage>
     </div>
     <div v-if="model.f_equipment_type[0] === 'PHONE'">
-      <phone-manage></phone-manage>
+      <phone-manage :users="users"></phone-manage>
     </div>
   </div>
 </template>
 
 <script>
 
+  import {HttpResetClass} from "vue-client";
+
   export default {
     title: '终端控制',
     data () {
@@ -39,6 +41,7 @@
         userid:this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
         equipmentType: this.$appdata.getParam('终端类型'),
+        users:[],
         model: {
             f_equipment_type: []
         }
@@ -47,12 +50,27 @@
     ready () {
       console.log('看看终端类型',  this.equipmentType)
       this.model.f_equipment_type = [this.equipmentType[0].value]
+      this.getUser()
     },
     methods: {
       del (row) {
           console.log('要删除了', row)
       },
-
+      getUser(){
+        new HttpResetClass().load('POST', '/rs/search', {
+          "source": " this.getParentByType($organization$).getAllChildrens().where(row.getAttributes().get($resourcetype$).indexOf($user$) != -1))",
+          "userid": this.$login.f.id
+        }, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+          this.users=[]
+          let ids=[]
+          res.data.forEach((resRow) => {
+            if(resRow.state=='在职' && !ids.includes(resRow.id+'_'+resRow.name)){
+              ids.push(resRow.id+'_'+resRow.name)
+              this.users.push({label:resRow.name,value:{id:resRow.id,name:resRow.name}})
+            }
+          })
+        })
+      },
       getRes (obj) {
         this.filialeNameStr = obj.res
         this.filialeCodeStr = obj.resids

package/src/components/equipment/PcAdd.vue

@@ -7,7 +7,15 @@
       <form class="form-horizontal">
           <div class="col-sm-6 form-group">
             <label class="font_normal_body">使用人员</label>
-            <input type="text"  style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
+            <v-select style="width:60% "
+                      class="select select_list"
+                      :value.sync="model.f_username"
+                      v-model="model.f_username"
+                      :options='users'
+                      placeholder='人员选择'
+                      value-single
+                      close-on-select>
+            </v-select>
           </div>
           <div class="col-sm-6 form-group">
             <label class="font_normal_body">所属地址</label>
@@ -48,11 +56,11 @@
           f_equipment_type: 'PC',
           f_state: '正常'
         },
-        curorgid: this.$login.f.orgid,
+        curorgid: [this.$login.f.orgid],
         f_orgid: ''
       }
     },
-    props: ['data'],
+    props: ['data','users'],
     watch: {
       'data' (val) {
           if (val) {
@@ -70,6 +78,8 @@
     },
     methods: {
       confirm () {
+        this.model.f_user_operatorid=this.model.f_username.id
+        this.model.f_user_operator=this.model.f_username.name
         this.model.f_operator = this.$login.f.name
         this.model.f_operatorid = this.$login.f.id
         this.model.f_orgid = this.f_orgid

package/src/components/equipment/PcList.vue

@@ -54,7 +54,7 @@
         <template partial='body':model="model">
           <tr>
             <td style="text-align:center">{{$index+1}}</td>
-            <td style="text-align:center">{{row.f_username}}</td>
+            <td style="text-align:center">{{row.f_user_operator}}</td>
             <td style="text-align:center">{{row.f_mac_outlets}}</td>
             <td style="text-align:center">{{row.f_mac_number}}</td>
             <td style="text-align:center">

package/src/components/equipment/PcManage.vue

@@ -4,7 +4,7 @@
     <pc-list :row="row" @select-changed="selected"  style="width:auto;" v-ref:list ></pc-list>
     </div>
     <div class="binary-right" style="margin-left: 10px; width: 50%;" v-if="isChange">
-      <pc-add :data="row" v-ref:addbox></pc-add>
+      <pc-add :data="row" :users="users" v-ref:addbox></pc-add>
     </div>
   </div>
 </template>
@@ -18,6 +18,7 @@
     components: {
       PcList, PcAdd
     },
+    props:['users'],
     data () {
       return {
         isChange: false,

package/src/components/equipment/PhoneAdd.vue

@@ -8,7 +8,16 @@
 
         <div class="col-sm-6 form-group">
           <label class="font_normal_body">使用人员</label>
-          <input type="text" style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
+<!--          <input type="text" style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >-->
+          <v-select style="width:60% "
+                    class="select select_list"
+                    :value.sync="model.f_username"
+                    v-model="model.f_username"
+                    :options='users'
+                    placeholder='人员选择'
+                    value-single
+                    close-on-select>
+          </v-select>
         </div>
         <div class="col-sm-6 form-group">
           <label class="font_normal_body">设备号</label>
@@ -33,13 +42,13 @@
   </div>
 </template>
 <script>
-
+import { HttpResetClass } from 'vue-client'
 
   export default {
     data () {
       return {
         model: {
-          f_username: '',
+          f_username: null,
           f_terminal_number: '',
           f_equipment_type: 'PHONE',
           f_state: '正常'
@@ -47,11 +56,11 @@
         filialeCodeStr: this.$login.f.f_orgids,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
-        curorgid: this.$login.f.orgid,
+        curorgid: [this.$login.f.orgid],
         f_orgid: ''
       }
     },
-    props: ['data'],
+    props: ['data','users'],
     watch: {
       'data' (val) {
         if (val) {
@@ -69,8 +78,10 @@
     },
     methods: {
       confirm () {
+        this.model.f_user_operatorid=this.model.f_username.id
+        this.model.f_user_operator=this.model.f_username.name
         this.model.f_operator = this.$login.f.name
-        this.model.f_filialeids = this.filialeCodeStr
+        this.model.f_filialeids = this.$login.f.f_orgids
         this.model.f_orgid = this.f_orgid
         console.log('保存', this.model)
         this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
@@ -81,7 +92,7 @@
       },
       edit (row) {
         console.log('修改，，。。', row)
-        this.model.f_username = row.f_username
+        this.model.f_username = {id:row.f_user_operatorid,name:row.f_user_operator}
         this.model.f_terminal_number = row.f_terminal_number
         this.model.id = row.id
         this.filialeCodeStr = row.f_filialeids

package/src/components/equipment/PhoneList.vue

@@ -43,7 +43,7 @@
         <template partial='body':model="model">
           <tr>
             <td style="text-align:center">{{$index+1}}</td>
-            <td style="text-align:center">{{row.f_username}}</td>
+            <td style="text-align:center">{{row.f_user_operator}}</td>
             <td style="text-align:center">{{row.f_terminal_number}}</td>
             <td style="text-align:center">
               <button class="btn btn-danger"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
@@ -61,6 +61,7 @@
   export default {
     title: 'PC',
     components: {},
+
     data () {
       return {
         model: new PagedList('rs/sql/equipmentQuery', 20),

package/src/components/equipment/PhoneManage.vue

@@ -4,7 +4,7 @@
     <phone-list :row="row" @select-changed="selected"  style="width:auto;" v-ref:list ></phone-list>
     </div>
     <div class="binary-right" style="margin-left: 10px; width: 50%;" v-if="isChange">
-      <phone-add :data="row" v-ref:addbox></phone-add>
+      <phone-add :data="row" :users="users" v-ref:addbox></phone-add>
     </div>
   </div>
 </template>
@@ -18,6 +18,7 @@
     components: {
       PhoneList, PhoneAdd
     },
+    props:['users'],
     data () {
       return {
         isChange: false,

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

package/src/filiale/konggang/system.js

@@ -2,6 +2,6 @@
 
 let specialComp = {
   // 潜能密码改下
-  'login': (resolve) => { require(['./login.vue'], resolve) }
+  'login': (resolve) => { require(['./Login.vue'], resolve) }
 }
 exports.specialComp = specialComp