system-clients 4.0.3 → 4.0.4

package/src/components/addressManage/AddressCascadingMenu.vue

@@ -1,145 +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>
+<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/common/ProgressBase.vue

@@ -1,83 +1,83 @@
-<template>
-  <div class="m-progress" style="width:100%">
-    <div class="m-progress-outer">
-      <div class="m-progress-inner">
-        <div :class="['u-progress-bg', {'u-success-bg':getProgress(progress,width) >= 100}]" :style="{width: `${getProgress(progress,width) >= 100 ? 100:getProgress(progress,width)}%`,height: `${strokeWidth}px`}"></div>
-      </div>
-    </div>
-    <div v-if="showInfo">
-      <svg class="u-success" v-if="getProgress(progress,width)>=100" viewBox="64 64 896 896" data-icon="check-circle" aria-hidden="true" focusable="false"><path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm193.5 301.7l-210.6 292a31.8 31.8 0 0 1-51.7 0L318.5 484.9c-3.8-5.3 0-12.7 6.5-12.7h46.9c10.2 0 19.9 4.9 25.9 13.3l71.2 98.8 157.2-218c6-8.3 15.6-13.3 25.9-13.3H699c6.5 0 10.3 7.4 6.5 12.7z"></path></svg>
-      <p class="u-progress-text" v-else>{{getProgress(progress,width)>=100 ? 100:getProgress(progress,width) }}%</p>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  name: 'Progress',
-  props: {
-    width: { // 进度条总宽度
-      type: Number,
-      default: 100
-    },
-    progress: { // 当前进度
-      type: Number,
-      default: 0
-    },
-    strokeWidth: { // 进度条线的宽度
-      type: Number,
-      default: 13
-    },
-    showInfo: { // 是否显示进度数值或状态图标
-      type: Boolean,
-      default: true
-    }
-  },
-
-  methods: {
-    // 进度的转换
-    getProgress(val1,val2){
-      if (val1 === 0 || val2 === 0) {
-        return 0
-      }
-      return (Math.round(val1/val2 * 10000) /100)
-    },
-  }
-}
-</script>
-<style lang="less" scoped>
-.m-progress {
-  height: 13px;
-  margin: 0 auto;
-  display: flex;
-  .m-progress-outer {
-    width: 61%;
-    .m-progress-inner {
-      display: inline-block;
-      width: 100%;
-      background: #f1f0f0;
-      border-radius: 13px;
-      .u-progress-bg {
-        // background: #1890FF;
-        background: linear-gradient(to right, rgb(16, 142, 233), rgb(135, 208, 104));
-        border-radius: 100px;
-        transition: all .3s cubic-bezier(.08,.82,.17,1);
-      }
-      .u-success-bg {
-        border-radius: 100px;
-        background: #52C41A;
-      }
-    }
-  }
-  .u-success {
-    width: 12px;
-    height: 12px;
-    fill: #52C41A;
-    margin-left: 2px;
-  }
-  .u-progress-text {
-    font-size: 12px;
-    margin-left: 2px;
-    color: rgba(0,0,0,.45);
-  }
-}
-</style>
+<template>
+  <div class="m-progress" style="width:100%">
+    <div class="m-progress-outer">
+      <div class="m-progress-inner">
+        <div :class="['u-progress-bg', {'u-success-bg':getProgress(progress,width) >= 100}]" :style="{width: `${getProgress(progress,width) >= 100 ? 100:getProgress(progress,width)}%`,height: `${strokeWidth}px`}"></div>
+      </div>
+    </div>
+    <div v-if="showInfo">
+      <svg class="u-success" v-if="getProgress(progress,width)>=100" viewBox="64 64 896 896" data-icon="check-circle" aria-hidden="true" focusable="false"><path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm193.5 301.7l-210.6 292a31.8 31.8 0 0 1-51.7 0L318.5 484.9c-3.8-5.3 0-12.7 6.5-12.7h46.9c10.2 0 19.9 4.9 25.9 13.3l71.2 98.8 157.2-218c6-8.3 15.6-13.3 25.9-13.3H699c6.5 0 10.3 7.4 6.5 12.7z"></path></svg>
+      <p class="u-progress-text" v-else>{{getProgress(progress,width)>=100 ? 100:getProgress(progress,width) }}%</p>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'Progress',
+  props: {
+    width: { // 进度条总宽度
+      type: Number,
+      default: 100
+    },
+    progress: { // 当前进度
+      type: Number,
+      default: 0
+    },
+    strokeWidth: { // 进度条线的宽度
+      type: Number,
+      default: 13
+    },
+    showInfo: { // 是否显示进度数值或状态图标
+      type: Boolean,
+      default: true
+    }
+  },
+
+  methods: {
+    // 进度的转换
+    getProgress(val1,val2){
+      if (val1 === 0 || val2 === 0) {
+        return 0
+      }
+      return (Math.round(val1/val2 * 10000) /100)
+    },
+  }
+}
+</script>
+<style lang="less" scoped>
+.m-progress {
+  height: 13px;
+  margin: 0 auto;
+  display: flex;
+  .m-progress-outer {
+    width: 61%;
+    .m-progress-inner {
+      display: inline-block;
+      width: 100%;
+      background: #f1f0f0;
+      border-radius: 13px;
+      .u-progress-bg {
+        // background: #1890FF;
+        background: linear-gradient(to right, rgb(16, 142, 233), rgb(135, 208, 104));
+        border-radius: 100px;
+        transition: all .3s cubic-bezier(.08,.82,.17,1);
+      }
+      .u-success-bg {
+        border-radius: 100px;
+        background: #52C41A;
+      }
+    }
+  }
+  .u-success {
+    width: 12px;
+    height: 12px;
+    fill: #52C41A;
+    margin-left: 2px;
+  }
+  .u-progress-text {
+    font-size: 12px;
+    margin-left: 2px;
+    color: rgba(0,0,0,.45);
+  }
+}
+</style>

package/src/components/equipment/EquipmentManage.vue

@@ -1,83 +1,83 @@
-<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 :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 :users="users"></phone-manage>
-    </div>
-  </div>
-</template>
-
-<script>
-
-  import {HttpResetClass} from "vue-client";
-
-  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('终端类型'),
-        users:[],
-        model: {
-            f_equipment_type: []
-        }
-      }
-    },
-    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
-      },
-    },
-    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 :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 :users="users"></phone-manage>
+    </div>
+  </div>
+</template>
+
+<script>
+
+  import {HttpResetClass} from "vue-client";
+
+  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('终端类型'),
+        users:[],
+        model: {
+            f_equipment_type: []
+        }
+      }
+    },
+    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
+      },
+    },
+    computed: {
+
+    }
+  }
+</script>