system-phone 1.3.11 → 3.0.1

package/src/components/PhoneUserFind.vue

@@ -1,137 +1,138 @@
-<template>
-  <div class="app-botton" @click="back()" v-if="show">
-    <span class="glyphicon glyphicon-menu-left">返回</span>
-  </div>
-  <div class="select-overspread auto" style="padding-bottom:5px;" v-show="!show">
-      <div class="auto repair-info-content compatible">
-        <div class="row">
-          <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
-            <input type="text" class="form-control" v-model="model.f_userid"  placeholder='用户编号'>
-          </div>
-          <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
-            <input type="text" class="form-control" v-model="model.f_username"  placeholder='姓名'>
-          </div>
-          <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
-            <input type="text" class="form-control" v-model="model.f_address"  placeholder='地址'>
-          </div>
-        </div>
-        <div class="row">
-            <button type="button" name="button" class="btn btn-primary pull-right" @click="search()">查询</button>
-            <button type="button" name="button" class="btn btn-primary pull-right" @click="read()">读卡</button>
-        </div>
-      </div>
-      <div partial class="panel panel-default well" style="padding: 0px;background-color:#ffffff;" v-for="row in users">
-        <div class="panel-body inbg" @click="selectUser(row)">
-            <div class="row auto"  >
-              <div class="col-sm-4">
-                用户编号: {{row.f_userinfo_code}}
-              </div>
-              <div class="col-sm-4">
-                用户姓名: {{row.f_user_name}}
-              </div>
-              <div class="col-sm-4">
-                用户电话: {{row.f_user_phone}}
-              </div>
-              <div class="col-sm-3">
-                用户类别: {{row.f_user_type}}
-              </div>
-              <div class="col-sm-9">
-                地址信息: {{row.f_address}}
-              </div>
-              <div class="col-sm-6">
-                表底数: {{row.f_meter_base}}
-              </div>
-              <div class="col-sm-6">
-                表上余额: {{row.f_balance_amount}}
-              </div>
-            </div>
-        </div>
-      </div>
-  </div>
-  <phone-info-table  :user="user" :is-need-condition="false" :is-group="false" v-if="show"></phone-info-table>
-</template>
-
-<script>
-  import Vue from 'vue'
-  import { HttpResetClass } from 'vue-client'
-  export default {
-    title: '移动端用户信息查询',
-    props: {
-
-    },
-    data () {
-      return {
-        users:[],
-        model:{
-          f_userid:'',
-          f_username:'',
-          f_address:''
-        },
-        user:'',
-        show:false
-      }
-    },
-    methods: {
-      search() {
-        this.model.f_userid ? this.model.f_userid : '1=1'
-        let condition = `ti.f_orgstr like '%${Vue.user.f_orgids}%'`
-        condition += this.model.f_userid ? ` and ti.f_userinfo_code = '${this.model.f_userid}'` : ' and 1=1'
-        condition += this.model.f_username ? ` and ti.f_user_name like '%${this.model.f_username}%'` : ' and 1=1'
-        condition += this.model.f_address ? ` and ti.f_address like '%${this.model.f_address}%'` : ' and 1=1'
-        console.log(condition)
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_UserInfo`, {
-          data: {
-            condition:condition
-          }
-        }).then((res) => {
-          console.log("查找用户返回的结果")
-          console.log(res.data)
-          this.users = res.data
-        })
-      },
-      selectUser(row){
-        this.user = row
-        this.show = true
-      },
-      back(){
-        this.show = false
-      },
-      read(){
-        // 读卡
-       let res =  HostApp.read()
-        if(res.code == 200){
-          let cardid = res.msg.CardID
-          let condition1 = `tf.f_card_id = '${cardid}'`
-          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_UserInfo`, {
-            data: {
-              condition:condition1
-            }
-          }).then((res) => {
-            console.log("查找用户返回的结果")
-            console.log(res.data)
-            this.users = res.data
-          })
-        }else{
-          HostApp.alert('读卡异常，请检查读卡设备!')
-        }
-      }
-    },
-    ready(){
-    }
-  }
-</script>
-<style>
-  .app-botton {
-    position:fixed;
-    background: #87b2dd;
-    color: #FFF;
-    padding: 8px;
-    text-align: center;
-    font-size: 1.2em;
-    z-index: 10;
-    opacity:0.5;
-    bottom: 50px;
-    margin-top: -10px;
-    height: 40px;
-  }
-</style>
+<template>
+  <div class="app-botton" @click="back()" v-if="show">
+    <span class="glyphicon glyphicon-menu-left">返回</span>
+  </div>
+  <div class="select-overspread auto" style="padding-bottom:5px;" v-show="!show">
+      <div class="auto repair-info-content compatible">
+        <div class="row">
+          <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
+            <input type="text" class="form-control" v-model="model.f_userid"  placeholder='用户编号'>
+          </div>
+          <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
+            <input type="text" class="form-control" v-model="model.f_username"  placeholder='姓名'>
+          </div>
+          <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
+            <input type="text" class="form-control" v-model="model.f_address"  placeholder='地址'>
+          </div>
+        </div>
+        <div class="row">
+            <button type="button" name="button" class="btn btn-primary pull-right" @click="search()">查询</button>
+<!--            <button type="button" name="button" class="btn btn-primary pull-right" @click="read()">读卡</button>-->
+        </div>
+      </div>
+      <div partial class="panel panel-default well" style="padding: 0px;background-color:#ffffff;" v-for="row in users">
+        <div class="panel-body inbg" @click="selectUser(row)">
+            <div class="row auto"  >
+              <div class="col-sm-4">
+                用户编号: {{row.f_userinfo_code}}
+              </div>
+              <div class="col-sm-4">
+                用户姓名: {{row.f_user_name}}
+              </div>
+              <div class="col-sm-4">
+                用户电话: {{row.f_user_phone}}
+              </div>
+              <div class="col-sm-3">
+                用户类别: {{row.f_user_type}}
+              </div>
+              <div class="col-sm-9">
+                地址信息: {{row.f_address}}
+              </div>
+              <div class="col-sm-6">
+                表底数: {{row.f_meter_base}}
+              </div>
+              <div class="col-sm-6">
+                表上余额: {{row.f_balance_amount}}
+              </div>
+            </div>
+        </div>
+      </div>
+  </div>
+  <phone-info-table  :user="user" :is-need-condition="false" :is-group="false" v-if="show"></phone-info-table>
+</template>
+
+<script>
+  import Vue from 'vue'
+  import { HttpResetClass } from 'vue-client'
+  export default {
+    title: '移动端用户信息查询',
+    props: {
+
+    },
+    data () {
+      return {
+        users:[],
+        model:{
+          f_userid:'',
+          f_username:'',
+          f_address:''
+        },
+        user:'',
+        show:false
+      }
+    },
+    methods: {
+      search() {
+        // console.log("Vue.user",Vue.user)
+        this.model.f_userid ? this.model.f_userid : '1=1'
+        let condition = `ti.f_orgid = '${Vue.user.orgid}'`
+        condition += this.model.f_userid ? ` and ti.f_userinfo_code = '${this.model.f_userid}'` : ' and 1=1'
+        condition += this.model.f_username ? ` and ti.f_user_name like '%${this.model.f_username}%'` : ' and 1=1'
+        condition += this.model.f_address ? ` and tua.f_address like '%${this.model.f_address}%'` : ' and 1=1'
+        console.log(condition)
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_UserInfo`, {
+          data: {
+            condition:condition
+          }
+        }).then((res) => {
+          console.log("查找用户返回的结果")
+          console.log(res.data)
+          this.users = res.data
+        })
+      },
+      selectUser(row){
+        this.user = row
+        this.show = true
+      },
+      back(){
+        this.show = false
+      },
+      read(){
+        // 读卡
+       let res =  HostApp.read()
+        if(res.code == 200){
+          let cardid = res.msg.CardID
+          let condition1 = `tf.f_card_id = '${cardid}'`
+          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_UserInfo`, {
+            data: {
+              condition:condition1
+            }
+          }).then((res) => {
+            console.log("查找用户返回的结果")
+            console.log(res.data)
+            this.users = res.data
+          })
+        }else{
+          HostApp.alert('读卡异常，请检查读卡设备!')
+        }
+      }
+    },
+    ready(){
+    }
+  }
+</script>
+<style>
+  .app-botton {
+    position:fixed;
+    background: #87b2dd;
+    color: #FFF;
+    padding: 8px;
+    text-align: center;
+    font-size: 1.2em;
+    z-index: 10;
+    opacity:0.5;
+    bottom: 50px;
+    margin-top: -10px;
+    height: 40px;
+  }
+</style>

package/src/components/RightTree.vue

@@ -0,0 +1,214 @@
+<template>
+  <dropdown :model='model' class="auto" id="res-tree" v-if="!islist" v-el:dropdown :style="{width:width}">
+    <button type="button" class="btn btn-default dropdown-toggle select-style" data-toggle="dropdown">
+      <span class='btn-content' :style="{textOverflow:'ellipsis',overflow: 'hidden'}">{{ resname }}</span>
+      <span class="caret"></span>
+    </button>
+    <tree :model='model' :is-click="false" slot="dropdown-menu" class="dropdown-menu auto" role="menu">
+        <span  partial>
+          <span class="glyphicon glyphicon-chevron-down" v-show="row.open&&row.data.children.length>0" style="color:balck;"></span>
+          <span class="glyphicon glyphicon-chevron-right" v-show="!row.open&&row.data.children.length>0" style="color:balck;"></span>
+          <span class="RightTreeCanSelect" v-if="row.data.hasright" @click.stop="$parent.$parent.$parent.selectclick(row.data)">{{row.data.name}}</span>
+          <span class="RightTreeCanNotSelect" v-else>{{row.data.name}}</span>
+          <span class="glyphicon glyphicon-ok " v-if="$parent.$parent.$parent.isSelect(row.data.id)" style="color:balck;"></span>
+        </span>
+    </tree>
+  </dropdown>
+  <v-select v-if="islist"
+            placeholder='请选择'
+            :options='childrenOptions'
+            @change="selectclick"
+            :value-single="true"
+            close-on-select></v-select>
+</template>
+<script>
+  import * as ldapHelper from './../util/LdapHelper'
+  import Vue from 'vue'
+  export default {
+    title: '资源树',
+    props: {
+      source: {
+        type: String,
+        require: true,
+        default:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`
+      },
+      resid: {
+      },
+      islist: {
+        type: Boolean,
+        default: false
+      },
+      //是否有查看上级的权限
+      Url:{
+        type: String,
+        default:''
+      }
+    },
+    data () {
+      return {
+        width:'100%',
+        resobj:{res:Vue.user.orgs, resids:Vue.user.orgid},
+        userid: Vue.user.id,
+        resname:[Vue.user.orgs],
+        orgnames : [Vue.user.orgs],
+        orgids : [Vue.user.orgid],
+        orgobj:[],
+        model: [
+
+        ],
+        childrenOptions: []
+      }
+    },
+    methods: {
+      selectRes () {
+        let newobj={
+          "res": [this.resname],
+          "resids": [this.orgids],
+        }
+        this.$emit('re-res', newobj)
+      },
+      //点击资源的方法
+      selectclick (row) {
+        if(this.orgids.includes(row.id)){
+          this.orgnames=[]
+          this.orgids=[]
+          this.removeResChild(row)
+          this.orgnames.push(row.name)
+          this.orgids.push(row.id)
+          this.orgobj.push(row)
+        }else{
+          this.orgnames=[]
+          this.orgids=[]
+          this.orgobj=[]
+          this.addResChild(row)
+        }
+        console.log(this.orgnames.join(','))
+        this.resname = this.orgnames.length > 0 ? this.orgnames.join(','):'请选择'
+        let newobj={
+          "res": this.orgnames,
+          "resids": this.orgids,
+          "orgobj": this.orgobj,
+        }
+        this.$emit('re-res', newobj)
+      },
+      addResChild(val){
+        // if(this.orgids.includes(val.id)){
+        //   this.orgnames.splice(this.orgnames.indexOf(val.name),1)
+        //   this.orgids.splice(this.orgids.indexOf(val.id),1)
+        // }
+        this.orgnames.push(val.name)
+        this.orgids.push(val.id)
+        this.orgobj.push(val)
+        if(val.children && val.children.length>0){
+          Object.keys(val.children).forEach((key) => {
+            this.addResChild(val.children[key])
+          })
+        }
+      },
+      removeResChild(val){
+        this.orgnames.splice(this.orgnames.indexOf(val.name),1)
+        this.orgids.splice(this.orgids.indexOf(val.id),1)
+        this.orgobj.splice(this.orgids.indexOf(val),1)
+        if(val.children && val.children.length>0){
+          Object.keys(val.children).forEach((key) => {
+            this.removeResChild(val.children[key])
+          })
+        }
+      },
+      //检查是否显示对勾
+      isSelect(val) {
+        if(this.orgids.includes(val)){
+          return true
+        }else{
+          return false
+        }
+      },
+      //树形结构变成list
+      treetoList(val) {
+        for (let value of val) {
+          this.ergodicList(value)
+        }
+      },
+      //找到跟节点
+      ergodicList (val) {
+        val.children.length > 0 ? this.treetoList(val.children) : this.childrenOptions.push({label: val.name, value: val})
+      },
+      //处理显示默认值
+      dealResObj (val) {
+        try{
+          var arr=val.res.split(".")
+          //截取最后一个分公司名字
+          this.resname=arr[arr.length-1].toString()
+          this.resid = val.resids
+        }catch (e){
+          this.resname='请选择组织'
+        }
+      },
+      judgBoundary(){
+        //判断是否超出边界，超出移动
+        if(document.documentElement.offsetWidth< this.$els.dropdown.getBoundingClientRect().right){
+          this.left = document.documentElement.offsetWidth - this.$els.dropdown.getBoundingClientRect().right - 25
+        }
+      }
+    },
+    events: {
+
+    },
+    ready () {
+      console.log('righttree   ready')
+      if(this.$els.dropdown){
+        console.log('righttree1')
+        this.width = this.$els.dropdown.clientWidth * 0.7 +'px'
+      }
+      console.log('righttree2')
+      this.dealResObj (this.resobj)
+      console.log('righttree3')
+      var data = {
+        source: this.source,
+        userid: this.userid
+      }
+      console.log('向资源服务发送请求')
+      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/search`, data).then((ret) => {
+        console.log('向资源服务请求结束')
+        // 去掉前面的两层节点
+        ret.data[0].children[0].children.forEach((item) => {
+          this.model.push(item)
+        })
+        // 给资源添加父关系
+        ldapHelper.procParent(this.model)
+        if (this.islist) {
+          this.treetoList(this.model)
+        }
+        this.selectRes()
+      })
+    },
+    watch: {
+    }
+  }
+</script>
+<style lang="less">
+  #res-tree {
+    .list-group-item {
+      background-color: #FFF;
+      color: #000;
+      padding: 5px 10px;
+      border:0px;
+      white-space: nowrap;
+    }
+  }
+  #res-tree .list-group {
+    width: auto;
+    min-width: 100%;
+  }
+  .hide-text-overflow{
+    overflow: hidden;
+    text-overflow: ellipsis
+  }
+  .select-style {
+    border: 0px;
+    /*border-bottom: 2px solid #C9CCCF;*/
+    border: 1px solid #93B2D3;
+    border-radius: 0px;
+    color: #555;
+  }
+</style>