system-clients 3.2.1-25 → 3.2.1-28

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/PhoneAdd.vue

@@ -6,18 +6,23 @@
       </ul>
       <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="使用人员" >
-          </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>
-          </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 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>
-          </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 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 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'>
@@ -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_orgid 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: {
 

package/src/components/server/Login.vue

@@ -204,7 +204,7 @@ let saveGen = function *(self) {
         self.getDaiBan()
       }
     } else {
-      self.$goto('home-page', {functions: self.$login.f})
+      self.$goto('home-page', {functions: self.$login.f,config: self.config})
       // if (self.otherLogin){
       //   window.history.pushState(null,null,'')
       // }
@@ -289,7 +289,13 @@ export default {
         depPrompt: false,
         weakPassword: false,
         title: '燃气客服系统',
-        distanceLogin: false
+        distanceLogin: false,
+        // 那些角色可以定时获取预约提示
+        isTip : false,
+        // 那些角色可以定时获取预约提示
+        msgRole : '预约处理人员',
+        // 定时获取提示间隔 单位：分钟
+        times: 25,
       },
       otherLogin:false,
       login: false,
@@ -314,6 +320,24 @@ export default {
   methods: {
     async getDaiBan(){
       let http = new HttpResetClass()
+      await http.load('POST', '/rs/sql/singleTable', {data: {
+          tablename:'t_order_center',
+          condition:` f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and ( f_orderstate != '预约失败'  or f_orderstate is null ) `
+
+        }}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then((res) => {
+        let OrderDaiBan = {}
+        res.data.forEach(item=>{
+        OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
+        OrderDaiBan[item.f_ordertype].push(item)
+      })
+      this.OrderDaiBan = `您有${res.data.length}条需要处理的微信预约业务！`
+      if (res.data.length> 0){
+        this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
+      }
+    })
       let data = {
         condition: '1 = 1',
         data: {
@@ -335,24 +359,7 @@ export default {
           this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
         }
       })
-      await http.load('POST', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:` f_orderstate != '预约成功' and  f_orderstate != '预约失败'  or f_orderstate is null `
 
-        }}, {
-        resolveMsg: null,
-        rejectMsg: null
-      }).then((res) => {
-        let OrderDaiBan = {}
-        res.data.forEach(item=>{
-          OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
-          OrderDaiBan[item.f_ordertype].push(item)
-        })
-        this.OrderDaiBan = `您有${res.data.length}条需要处理的微信预约业务！`
-        if (res.data.length> 0){
-          this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
-        }
-      })
     },
     async loginother(){
       if (this.config.distanceLogin) {
@@ -431,7 +438,7 @@ export default {
 
     async depPromptConfirm () {
       this.depPromptShow = false
-      return this.$goto('home-page', {functions: this.$login.f})
+      return this.$goto('home-page', {functions: this.$login.f,config: this.config})
     },
 
     depPromptCancel () {