system-clients 3.2.4 → 3.2.6

package/src/components/TabButton.vue

@@ -0,0 +1,201 @@
+<template>
+  <div class='flex foot_tabset1'>
+    <!-- Nav tabs -->
+    <ul class="nav nav-{{navStyle}}" role="tablist" style="margin-left: 1%">
+      <li style="margin-right: 10px;height: 100%"
+          :id="'vc-tabset-li-'+attach +'-'+$index"
+          v-for="r in renderData"
+          @click.prevent="handleTabListClick($index, r)"
+          :disabled="r.disabled"
+      >
+        <button v-if="button" class="button_new" style="width: max-content" v-bind:class="{
+            'btn-succ': ($index === active),
+            'disabled': r.disabled
+          }">
+          <slot name="header">
+            {{ r.header }}
+          </slot>
+          <!-- 关闭按钮 -->
+          <span class="glyphicon glyphicon-remove" style="margin-left: 15px;" @click="deletetTab(r)" v-if="close"
+                :id="'vc-tabset-close-'+attach +'-'+$index"></span>
+        </button>
+        <span v-if="!button" v-bind:class="{
+            'span-active': ($index === active),
+            'span-disable': ($index !== active)
+          }">
+          <slot name="header">
+            {{ r.header }}
+          </slot>
+          <!-- 关闭按钮 -->
+          <span class="glyphicon glyphicon-remove" style="margin-left: 15px;" @click="deletetTab(r)" v-if="close"
+                :id="'vc-tabset-close-'+attach +'-'+$index"></span>
+        </span>
+
+      </li>
+    </ul>
+
+    <!-- Tab panes -->
+    <div class="tab-content span" v-el:tab-content>
+      <slot></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+import {remove} from 'vue-client/src/stores/Remove.js'
+
+export default {
+  props: {
+    navStyle: {
+      type: String,
+      default: 'tabs'
+    },
+    effect: {
+      type: String,
+      default: 'fadein'
+    },
+    active: {
+      type: Number,
+      default: 0
+    },
+    close: {
+      type: Boolean,
+      default: false
+    },
+    button: {
+      type: Boolean,
+      default: true
+    },
+    attach: {
+      type: String,
+      default: 'vuestrap'
+    },
+    content: {}
+  },
+  ready() {
+    remove.$on('remove', (name) => {
+      console.log('tabset收$on 到的名字为：', name)
+      this.$removeTab(name)
+    })
+  },
+  data() {
+    return {
+      // 数据格式：{comp, header，disabled}
+      // - comp: 当前页签对应的tab组件
+      renderData: []
+    }
+  },
+  methods: {
+    handleTabListClick(index, el) {
+      // 没有打开过, 则添加显示
+      this.$dispatch('tab-changed')
+      if (!this.$parent.show.includes(el.header)) {
+        this.$parent.show.push(el.header)
+      }
+      if (el.comp._scope && el.comp._scope.tab) {
+        this.$dispatch('tab-changed', el.comp._scope.tab.comp.name)
+      }
+      if (!el.disabled) this.active = index
+    },
+    // deletetab函数为自己添加
+    deletetTab(el) {
+      this.$removeTab(el.comp._scope.tab.comp.name)
+      remove.$emit('delete', el.comp._scope.tab.comp.name)
+    },
+    // 根据删除也下标，修改所有页签的下标
+    modifyAllIndex(index) {
+      let cur = this.active
+      this.$nextTick(() => {
+        // 关闭页签以后的多有页签的的下标向前挪动一位,之前的页签不动
+        for (var i = index; i < this.renderData.length; i++) {
+          this.renderData[i].comp.index -= 1
+        }
+        // 修改激活页
+        // 获取当前激活页签下标，关闭在当前激活页之后（包含当前激活页），当前激活页下标不变
+        // 当关闭当前激活页之前（激活页向前移动一位）
+        if (this.active > index || this.active === this.renderData.length) {
+          this.active = cur - 1
+        } else if (cur === 0) {
+          this.active = 0
+        } else {
+          this.active = cur
+        }
+        if (this.active === -1) {
+          this.$dispatch('tab-changed', null)
+        } else {
+          this.$dispatch('tab-changed', this.renderData[this.active].comp._scope.tab.comp.name)
+        }
+      })
+    }
+  },
+  events: {
+    'delete'(index) {
+      this.modifyAllIndex(index)
+    }
+  }
+}
+</script>
+
+<style scoped>
+ul > li > a {
+  position: relative;
+}
+
+ul > li > a > span {
+  display: none;
+}
+
+.span-active {
+  width: max-content;
+  border-bottom: 3px solid #5ac0d9;
+  height: 100%;
+  display: inline-block;
+  font-size: 1.5rem;
+  color: #666;
+  font-weight: 550;
+  padding: 0px 10px;
+  padding-top: 3px;
+  vertical-align: bottom;
+}
+
+.span-disable {
+  width: max-content;
+  height: 100%;
+  display: inline-block;
+  font-size: 1.5rem;
+  color: #666;
+  font-weight: 550;
+  padding: 0px 10px;
+  padding-top: 3px;
+  vertical-align: bottom;
+}
+
+/*ul > li > a:hover > span {*/
+/*display: initial;*/
+/*position: absolute;*/
+/*right: 0;*/
+/*top: 35%;*/
+/*border: 1px solid #EAEAEA;*/
+/*}*/
+/*ul > li > a:hover > span:hover {*/
+/*border: 1px solid #EAEAEA;*/
+/*color: #5cb95c;*/
+/*}*/
+ul > li > button {
+  background-color: #FFFFFF;
+  border-radius: 4px;
+  color: #999;
+  border: 1px solid #5cb95c;
+}
+
+.btn-succ {
+  background-color: #6aa6e2;
+  border-radius: 4px;
+  color: #fff;
+}
+
+.foot_tabset1 > .nav {
+  /*overflow-x: scroll;*/
+  white-space: nowrap;
+}
+</style>

package/src/components/Tabs.vue

@@ -0,0 +1,67 @@
+<template>
+  <div role="tabpanel" class="tab-pane"
+       v-bind:class="{hide:!show}"
+       v-show="show"
+       :transition="transition"
+  >
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+  import coerceBoolean from 'vue-client/src/vue-strap/src/utils/coerceBoolean.js'
+
+  export default {
+    props: {
+      header: {
+        type: String
+      },
+      disabled: {
+        type: Boolean,
+        coerce: coerceBoolean,
+        default: false
+      }
+    },
+    data () {
+      return {
+        index: 0,
+        show: false
+      }
+    },
+    watch: {
+      'header' (val) {
+        // header变化时，通知tabset
+        let data = this.$parent.renderData.find((v) => v.comp === this)
+        data.header = val
+      }
+    },
+    computed: {
+      show () {
+        return (this.$parent.active === this.index)
+      },
+      transition () {
+        return this.$parent.effect
+      }
+    },
+    created () {
+      this.$parent.renderData.push({
+        comp: this,
+        header: this.header,
+        disabled: this.disabled
+      })
+    },
+    ready () {
+      // 找到当前tab的索引
+      this.index = this.$parent.$children.findIndex((v) => v.$el === this.$el)
+    },
+    beforeDestroy () {
+      this.$parent.renderData.splice(this.index, 1)
+    }
+  }
+</script>
+
+<style scoped>
+  .tab-content > .tab-pane {
+    display: block;
+  }
+</style>

package/src/components/addressManage/AddressCascadingMenu.vue

@@ -0,0 +1,145 @@
+<template>
+    <div :class="style">
+      <label :class="font_style">小&emsp;&emsp;区</label>
+      <v-select :value.sync="initres.f_residential_area"
+                v-model="initres.f_residential_area"
+                class="input-font"
+                :options='residentialAreaOptions'
+                placeholder='小区名称'
+                @change="getbuilds"
+                close-on-select :valueSingle=true>
+      </v-select>
+    </div>
+    <div :class="style">
+      <label :class="font_style">楼&emsp;&emsp;栋</label>
+      <v-select :value.sync="initres.f_building"
+                v-model="initres.f_building"
+                class="input-font"
+                :options='buildOptions'
+                placeholder='楼栋'
+                @change="getUnits"
+                close-on-select :valueSingle="true">
+      </v-select>
+    </div>
+    <div :class="style">
+      <label :class="font_style">单&emsp;&emsp;元</label>
+      <v-select :value.sync="initres.f_unit"
+                v-model="initres.f_unit"
+                class="input-font"
+                :options='unitOptions'
+                placeholder='单元'
+                close-on-select :valueSingle="true">
+      </v-select>
+    </div>
+</template>
+<script>
+import {HttpResetClass} from "vue-client";
+/**
+*档案管理查询列表
+*/
+export default {
+  title: '小区查询',
+  props: {
+    style: {
+      type: String,
+      default: 'col-sm-2 form-group'
+    },
+    font_style: {
+      type: String,
+      default: 'font_normal_body'
+    },
+    mul: {
+      type: Boolean,
+      default: true
+    },
+    //初始值
+    initres: {
+      type: Object,
+      default: null,
+    },
+    conditions: {
+      type: Object,
+      default: null,
+    },
+    f_unit: {
+      type: String,
+      default: "f_unit = '{}'",
+    },
+    f_residential_area: {
+      type: String,
+      default: "f_residential_area = '{}'",
+    },
+    f_building: {
+      type: String,
+      default: "f_building = '{}'",
+    }
+  },
+  data () {
+    return {
+      residentialAreaOptions:[],
+      buildOptions:[],
+      unitOptions:[],
+      http:new HttpResetClass()
+    }
+  },
+  ready(){
+    this.getAllArea()
+    this.conditions=Object.assign({},this.conditions,{f_unit:this.f_unit,f_residential_area:this.f_residential_area,f_building:this.f_building})
+  },
+  methods: {
+    getAllArea(){
+      this.residentialAreaOptions = []
+      this.buildOptions = []
+      this.unitOptions = []
+      this.initres.f_residential_area = ''
+      this.initres.f_building = ''
+      this.initres.f_unit = ''
+      this.http.load('POST',"rs/sql/address_getarealist",{data:{condition: `s.f_filialeid = ${this.$login.f.orgid}`}},{resolveMsg: null, rejectMsg: null}).then(result =>{
+        if(result.data.length>0){
+          result.data.forEach(item => this.residentialAreaOptions.push({label:item.f_residential_area,value:item.f_residential_area}))
+        }
+      })
+    },
+    getbuilds(f_residential_area){
+      console.log('f_residential_area ===> ' + JSON.stringify(f_residential_area))
+      this.buildOptions = []
+      this.initres.f_building = ''
+      this.unitOptions = []
+      this.initres.f_unit = ''
+      if(f_residential_area.length<=0){
+        return
+      }
+      let criteria = {
+        condition: `f_building IS NOT NULL AND f_residential_area = '${f_residential_area}'`,
+        groupitem: 'f_building',
+        orderitem: 'f_building'
+      }
+      this.http.load('POST',"rs/sql/getUseraddressByCon",{'data': criteria},{resolveMsg: null, rejectMsg: null}).then(result =>{
+        if(result.data.length>0){
+          result.data.forEach(item => this.buildOptions.push({label:item.f_building,value:item.f_building}))
+        }
+      })
+
+    },
+    getUnits(f_building){
+      f_building = f_building[0]
+      this.unitOptions = []
+      this.initres.f_unit = ''
+      if(!f_building){
+        return
+      }
+      let criteria = {
+        condition: `f_unit IS NOT NULL AND f_unit != '' AND f_residential_area = '${this.initres.f_residential_area}' AND f_building = '${this.initres.f_building}'`,
+        orderitem: 'f_unit',
+        groupitem: 'f_unit'
+      }
+      this.http.load('POST',"rs/sql/getUseraddressByCon",{'data': criteria},{resolveMsg: null, rejectMsg: null}).then(result=>{
+        if(result.data.length>0){
+          result.data.forEach(item => this.unitOptions.push({label:item.f_unit,value:item.f_unit}))
+        }
+      })
+
+    }
+  }
+}
+</script>

package/src/components/equipment/EquipmentManage.vue

@@ -4,7 +4,7 @@
       <div class="form-horizontal select-overspread" style="background: white; padding: 0 1%;">
         <div class="row">
           <div class="col-sm-2 form-group">
-            <label class="font_normal_body">终端类型</label>
+            <label class="font_normal_body" title="参数管理：终端类型">终端类型</label>
             <v-select id="f_charge_type"
                       v-model="model.f_equipment_type"
                       placeholder='终端类型'

package/src/components/equipment/PcAdd.vue

@@ -1,23 +1,23 @@
 <template>
-  <div class="auto select-overspread">
+  <div class="row select-overspread">
     <validator name='v'>
       <ul class="nav nav-tabs" >
         <li role="presentation" class="active"><a href="#">PC端MAC</a></li>
       </ul>
       <form class="form-horizontal">
-          <div class="col-sm-6">
+          <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="使用人员" >
           </div>
-          <div class="col-sm-6">
+          <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_mac_outlets" placeholder="所属地址" >
           </div>
-          <div class="col-sm-6">
+          <div class="col-sm-6 form-group">
             <label class="font_normal_body">mac地址</label>
             <input type="text"  style="width: 60%" class="input_search" v-model="model.f_mac_number" placeholder="mac地址" >
           </div>
-          <div class="col-sm-6">
+          <div class="col-sm-6 form-group">
             <label class="font_normal_body">使用公司</label>
 
               <res-select restype='organization'

package/src/components/equipment/PcList.vue

@@ -4,7 +4,7 @@
       <criteria partial='criteria' @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">
+          <div class="col-sm-3 form-group">
             <label class="font_normal_body">使用公司</label>
             <res-select restype='organization'
                         is-mul="false"
@@ -13,12 +13,12 @@
             </res-select>
           </div>
 
-          <div class="col-sm-3" >
+          <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_username"
                     condition="f_username like '%{}%'" placeholder="使用人员">
           </div>
-          <div class="col-sm-3" >
+          <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_mac_outlets"
                     condition="f_mac_outlets like '%{}%'" placeholder="所属地址">
@@ -31,7 +31,7 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
-          <div class="col-sm-3" >
+          <div class="col-sm-3 form-group" >
             <label class="font_normal_body">MAC地址</label>
             <input  type="text" class="input_search" style="width:60%" v-model="model.f_mac_number"
                     condition="f_mac_number like '%{}%'" placeholder="MAC地址">
@@ -58,7 +58,7 @@
             <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">
-              <button class="btn btn-link"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
+              <button class="btn btn-danger"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
             </td>
           </tr>
         </template>

package/src/components/equipment/PhoneAdd.vue

@@ -1,23 +1,28 @@
 <template>
-  <div class="auto select-overspread">
+  <div class="row select-overspread">
     <validator name='v'>
       <ul class="nav nav-tabs" >
         <li role="presentation" class="active"><a href="#">Phone端设备号</a></li>
       </ul>
       <form class="form-horizontal">
 
-          <div class="col-sm-6">
-            <label class="font_normal_body">使用人员</label>
-            <input type="text" style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
-          </div>
-          <div class="col-sm-6">
-            <label class="font_normal_body">设备号</label>
-            <input type="text" style="width: 60%" class="input_search" v-model="model.f_terminal_number" placeholder="设备号" >
-          </div>
-          <div class="col-sm-6">
-            <label class="font_normal_body">使用公司</label>
-              <right-tree :userid.sync='userid' :source.sync='source' @re-res="getRes"></right-tree>
-          </div>
+        <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="使用人员" >
+        </div>
+        <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_terminal_number" placeholder="设备号" >
+        </div>
+        <div class="col-sm-6 form-group">
+          <label class="font_normal_body">使用公司</label>
+          <!--<right-tree :userid.sync='userid' :source.sync='source' @re-res="getRes"></right-tree>-->
+          <res-select restype='organization'
+                      is-mul="false"
+                      @res-select="getorg"
+                      :initresid="curorgid">
+          </res-select>
+        </div>
 
       </form>
       <div style="text-align:right;height:auto;">
@@ -42,6 +47,8 @@
         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,
+        f_orgid: ''
       }
     },
     props: ['data'],
@@ -64,6 +71,7 @@
       confirm () {
         this.model.f_operator = this.$login.f.name
         this.model.f_filialeids = this.filialeCodeStr
+        this.model.f_orgid = this.f_orgid
         console.log('保存', this.model)
         this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
           this.$dispatch('refresh')
@@ -77,6 +85,8 @@
         this.model.f_terminal_number = row.f_terminal_number
         this.model.id = row.id
         this.filialeCodeStr = row.f_filialeids
+        this.f_orgid = row.f_orgid
+        this.curorgid= [row.f_orgid]
       },
       initModel () {
         delete this.model.id
@@ -89,6 +99,9 @@
       getRes(obj) {
         this.filialeCodeStr = obj.resids
       },
+      getorg (val) {
+        this.f_orgid = val[0]
+      }
     }
   }
 </script>

package/src/components/equipment/PhoneList.vue

@@ -4,27 +4,32 @@
       <criteria partial='criteria' @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">
-            <label class="font_normal_body">使用公司</label>
-            <right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source'  @re-res="$parent.$parent.getRes" > </right-tree>
-          </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">使用公司</label>
+              <!--<right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source'  @re-res="$parent.$parent.getRes" > </right-tree>-->
+              <res-select restype='organization'
+                          is-mul="false"
+                          @res-select="$parent.$parent.getorg"
+                          :initresid="$parent.$parent.curorgid">
+              </res-select>
+            </div>
 
-          <div class="col-sm-3" >
-            <label class="font_normal_body">使用人员</label>
-            <input  type="text" class="input_search" style="width:60%" v-model="model.f_username"
-                    condition="f_username like '%{}%'" placeholder="使用人员">
-          </div>
-          <div class="col-sm-3" >
-            <label class="font_normal_body">设备号</label>
-            <input  type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
-                    condition="f_terminal_number like '%{}%'" placeholder="设备号">
-          </div>
-          <div class="span" style="float:right;">
-            <button class="button_search" @click="$parent.$parent.search()" v-el:cx>查询</button>
-            <button class="button_search" @click="$parent.$parent.add()" v-el:cx>新增</button>
+            <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_username"
+                      condition="f_username like '%{}%'" placeholder="使用人员">
+            </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_terminal_number"
+                      condition="f_terminal_number like '%{}%'" placeholder="设备号">
+            </div>
+            <div class="span" style="float:right;">
+              <button class="button_search" @click="$parent.$parent.search()" v-el:cx>查询</button>
+              <button class="button_search" @click="$parent.$parent.add()" v-el:cx>新增</button>
+            </div>
           </div>
         </div>
-        </div>
       </criteria>
       <data-grid  :model="model" partial='list' class="list_area table_sy"  v-ref:grid >
         <template partial='head'>
@@ -41,7 +46,7 @@
             <td style="text-align:center">{{row.f_username}}</td>
             <td style="text-align:center">{{row.f_terminal_number}}</td>
             <td style="text-align:center">
-              <button class="btn btn-link"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
+              <button class="btn btn-danger"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
             </td>
           </tr>
         </template>
@@ -62,7 +67,9 @@
         filialeNameStr: this.$login.f.f_fengongsi,
         filialeCodeStr: this.$login.f.f_orgids,
         userid:this.$login.f.id,
-        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`
+        curorgid: [this.$login.f.orgid],
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
+        f_orgid:''
       }
     },
     ready () {
@@ -75,7 +82,7 @@
       },
 
       selfSearch (args) {
-        args.condition =  `${args.condition} and f_equipment_type = 'PHONE' and f_state = '正常' and f_filialeids like '${this.filialeCodeStr}%'`
+        args.condition =  `${args.condition} and f_equipment_type = 'PHONE' and f_state = '正常' and f_orgid = '${this.f_orgid ? this.f_orgid: this.$login.f.orgid}'`
         this.model.search(args.condition, this.model)
       },
       add () {
@@ -94,6 +101,9 @@
         this.filialeNameStr = obj.res
         this.filialeCodeStr = obj.resids
       },
+      getorg (val) {
+        this.f_orgid = val[0]
+      }
     },
     computed: {