system-clients 3.2.1-24 → 3.2.1-27

package/src/components/TabButton.vue

@@ -1,201 +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>
+<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/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

@@ -1,65 +1,65 @@
-<template>
-  <div class="flex">
-    <div class="auto">
-      <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" title="参数管理：终端类型">终端类型</label>
-            <v-select id="f_charge_type"
-                      v-model="model.f_equipment_type"
-                      placeholder='终端类型'
-                      :value.sync="model.f_equipment_type"
-                      :options='equipmentType'
-                      close-on-select clear-button>
-            </v-select>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div v-if="model.f_equipment_type[0] === 'PC'">
-      <pc-manage></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>
-    </div>
-  </div>
-</template>
-
-<script>
-
-  export default {
-    title: '终端控制',
-    data () {
-      return {
-        filialeNameStr: this.$login.f.f_fengongsi,
-        filialeCodeStr: this.$login.f.orgid,
-        userid:this.$login.f.id,
-        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
-        equipmentType: this.$appdata.getParam('终端类型'),
-        model: {
-            f_equipment_type: []
-        }
-      }
-    },
-    ready () {
-      console.log('看看终端类型',  this.equipmentType)
-      this.model.f_equipment_type = [this.equipmentType[0].value]
-    },
-    methods: {
-      del (row) {
-          console.log('要删除了', row)
-      },
-
-      getRes (obj) {
-        this.filialeNameStr = obj.res
-        this.filialeCodeStr = obj.resids
-      },
-    },
-    computed: {
-
-    }
-  }
-</script>
+<template>
+  <div class="flex">
+    <div class="auto">
+      <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" title="参数管理：终端类型">终端类型</label>
+            <v-select id="f_charge_type"
+                      v-model="model.f_equipment_type"
+                      placeholder='终端类型'
+                      :value.sync="model.f_equipment_type"
+                      :options='equipmentType'
+                      close-on-select clear-button>
+            </v-select>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div v-if="model.f_equipment_type[0] === 'PC'">
+      <pc-manage></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>
+    </div>
+  </div>
+</template>
+
+<script>
+
+  export default {
+    title: '终端控制',
+    data () {
+      return {
+        filialeNameStr: this.$login.f.f_fengongsi,
+        filialeCodeStr: this.$login.f.orgid,
+        userid:this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
+        equipmentType: this.$appdata.getParam('终端类型'),
+        model: {
+            f_equipment_type: []
+        }
+      }
+    },
+    ready () {
+      console.log('看看终端类型',  this.equipmentType)
+      this.model.f_equipment_type = [this.equipmentType[0].value]
+    },
+    methods: {
+      del (row) {
+          console.log('要删除了', row)
+      },
+
+      getRes (obj) {
+        this.filialeNameStr = obj.res
+        this.filialeCodeStr = obj.resids
+      },
+    },
+    computed: {
+
+    }
+  }
+</script>