system-clients 3.1.89-8 → 3.1.90

package/src/components/equipment/PosParamList.vue

@@ -0,0 +1,121 @@
+<template>
+  <div class="flex">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' style="background-color: white" @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">公&nbsp;&nbsp;&nbsp;司</label>
+              <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_param_name"
+                     condition="name like '%{}%'" placeholder="参数名称">
+            </div>
+            <div class="span" style="float:right;margin-top: 6px">
+              <button type="button" class="button_search" @click="search()" v-el:cx>查询</button>
+              <button type="button" class="button_search" @click="$parent.$parent.add() " v-el:cx>新增</button>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th style="text-align:center;white-space:nowrap;">参数id</th>
+            <th style="text-align:center;white-space:nowrap;">参数名称</th>
+            <th style="text-align:center;white-space:nowrap;">所属分公司</th>
+            <th style="text-align:center;white-space:nowrap;">所属银行</th>
+            <th style="text-align:center;white-space:nowrap;">创建人</th>
+            <th style="text-align:center;white-space:nowrap;">操作</th>
+          </tr>
+        </template>
+        <template partial='body' :model="model">
+          <tr>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_param_id }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.name }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_orgname }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_bank_name }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_operator }}</td>
+            <td style="text-align:center;white-space:nowrap;">
+              <div class="col-sm-1"></div>
+              <div class="col-sm-4">
+                <button type="button" class="btn button_new" v-if="!row.sum||row.sum ===0 "
+                        @click.stop="$parent.$parent.$parent.delete(row)">删除
+                </button>
+              </div>
+              <div class="col-sm-1"></div>
+              <div class="col-sm-4">
+                <button type="button" class="btn button_new"
+                        @click.stop="$parent.$parent.$parent.modify(row)">修改
+                </button>
+              </div>
+              <div class="col-sm-1"></div>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+
+import {PagedList} from 'vue-client'
+
+export default {
+  title: '终端控制',
+  components: {},
+  data() {
+    return {
+      model: new PagedList('rs/sql/get_posParam', 20),
+      curorgid: [this.f_filialeid],
+    }
+  },
+  props: [],
+  ready() {
+    this.search()
+  },
+  watch: {},
+  methods: {
+    getRes(val) {
+      if (val.orgobj.length === 1 && val.orgobj[0].resourcetype === 'user') {
+        this.$refs.paged.$refs.cri.model.f_user_operatorid = val.orgobj[0].userid
+        this.$refs.paged.$refs.cri.model.f_user_operator = val.orgobj[0].name
+      } else {
+        this.$refs.paged.$refs.cri.model.f_user_operatorid = ''
+        this.$refs.paged.$refs.cri.model.f_user_operator = ''
+      }
+    },
+    async delete(row) {
+      await this.$resetpost('rs/logic/deletePosParam', {data: row}, {rejectMsg: null, resolveMsg: null})
+      await this.search()
+    },
+    modify(row) {
+      this.$dispatch('modify', row)
+    },
+    search() {
+      this.$refs.paged.$refs.cri.search()
+    },
+    selfSearch(args) {
+      if (this.f_orgid) {
+        args.condition += ` and f_orgid = ${this.f_orgid} `
+      }
+      this.model.search(args.condition, this.model)
+    },
+    add() {
+      this.$dispatch('add', this.f_filialeid)
+    },
+    getorg(val) {
+      this.f_orgid = val[0]
+      this.f_filialeid = val[0]
+    }
+  },
+  computed: {}
+}
+</script>

package/src/components/equipment/PosParamManage.vue

@@ -0,0 +1,51 @@
+<template>
+  <div class="flex-row">
+    <div :class="{'basic-main':!isChange,'binary-left':isChange}">
+      <pos-param-list v-ref:list></pos-param-list>
+    </div>
+    <div class="binary-right" style="margin-left: 10px; width: 40%;" v-if="isChange">
+      <pos-param-add :param_id="param_id" v-ref:add></pos-param-add>
+    </div>
+  </div>
+</template>
+<script>
+
+import PosParamList from './PosParamList'
+import PosParamAdd from './PosParamAdd'
+
+export default {
+  title: 'POS终端管理',
+  components: {
+    PosParamList, PosParamAdd
+  },
+  data() {
+    return {
+      isChange: false,
+      param_id: ''
+    }
+  },
+  methods: {},
+  events: {
+    'add'() {
+      this.isChange = true
+      setTimeout(() => {
+        this.$refs.add.initModel()
+      }, 100)
+    },
+    'close'() {
+      this.isChange = false
+    },
+    'research'() {
+      this.$refs.list.search()
+      this.isChange = false
+    },
+    'modify'(row) {
+      this.isChange = true
+      setTimeout(() => {
+        this.$refs.add.curorgid = []
+        this.$refs.add.edit(row.f_param_id)
+      }, 100)
+    }
+  }
+}
+</script>

package/src/components/parammanage/ParamPage.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex">
     <p class="bg-info text-center" style="padding: 8px;">参数管理
-      <span class="btn btn-link add-postition" @click="add('t_parameter')">新增</span>
+      <button type="button" name="button" class="button_search button_spacing width-60" @click="add('t_parameter')" style="float:right">新增</button>
     </p>
     <div class="auto">
       <form class="form-horizontal" style="margin-bottom: 5px;">
@@ -25,7 +25,7 @@
       </form>
     </div>
     <div class="span">
-      <data-grid :model="model" v-ref:params @select-changed="selected" class="list_area table_sy">
+      <data-grid :model="model" v-ref:params @select-changed="selected">
         <template partial='head'>
           <tr>
             <th>序号</th>
@@ -50,7 +50,7 @@
 
     <p v-if="selectItem" class="bg-info text-center" style="padding: 8px;margin: 8px 0px;">
       {{selectItem.name}}
-      <span class="btn btn-link add-postition" @click="add('t_paramvalue')">新增</span>
+      <button type="button" name="button" class="button_search button_spacing width-60" @click="add('t_paramvalue')" style="float:right">新增</button>
     </p>
     <div v-if="selectItem" class="span">
       <data-grid :model="params" v-ref:selects >

package/src/components/parammanage/SinglePage.vue

@@ -2,7 +2,7 @@
   <div class="flex">
     <p  class="bg-info text-center" style="padding: 8px;">
       单值管理
-      <span class="btn btn-link add-postition" @click="add()">新增</span>
+      <button type="button" name="button" class="button_search button_spacing width-60 " @click="add()" style="float:right">新增</button>
     </p>
     <div class="auto">
       <form class="form-horizontal" style="margin-bottom: 5px;">
@@ -27,7 +27,7 @@
     </div>
     <div class="span">
       <partial-view v-ref:single-load>
-        <data-grid :model="model" v-ref:grid class="list_area table_sy">
+        <data-grid :model="model" v-ref:grid >
           <template partial='head'>
             <tr>
               <th>序号</th>

package/src/components/server/Login.vue

@@ -1,17 +1,30 @@
 <template>
   <div class="syslogin">
     <div class="login-title" >
-      <div class="login-title-chi" style="white-space: nowrap">
-        <img src="../../../static/newStyle/login-info.png"/>
-        <span>关于我们</span>
-        <img src="../../../static/newStyle/login-con.png"/>
-        <span>联系我们</span>
+      <div class="row auto">
+        <marquee style="width:80%;margin-top:25px"><span  style="font-size: 1.8rem;color: white;">{{notice}}</span></marquee>
+        <div class="login-title-chi" style="white-space: nowrap;margin-right:-5%">
+          <img src="../../../static/newStyle/login-info.png"/>
+          <span @click="showus=true">关于我们</span>
+<!--          <img src="../../../static/newStyle/login-con.png"/>-->
+<!--          <span>联系我们</span>-->
+        </div>
       </div>
     </div>
+
+    <modal :show.sync="showus"  backdrop="true" width="50%" style="width:auto;">
+      <article slot="modal-body" class="modal-body" >
+        <img style="height:100%;width:100%" src="../../../static/newStyle/about-us.png"/>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+
+
     <div class="logoew" v-if="logoandroid" >
       <div v-if="logoandroid" class="imglogo"></div>
-        <p class="logocontent">燃气客服系统Android版</p>
-        <p  class="logofooter">(仅浏览器扫描)</p>
+      <p class="logocontent">燃气客服系统Android版</p>
+      <p  class="logofooter">(仅浏览器扫描)</p>
     </div>
     <!--输入框-->
     <div class="loginmain">
@@ -103,6 +116,7 @@
   import co from 'co'
   import $ from 'jquery'
   import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
 
   let saveGen = function *(self) {
     try {
@@ -190,7 +204,19 @@
   }
   export default {
     title: '登录',
-    ready () {
+    async ready () {
+      let http = new HttpResetClass()
+      let res = await http.load('POST', 'rs/sql/singleTable',
+        {data:{
+            tablename: 't_changedeclare',
+            condition: ` f_type ='变更通知' `
+          }
+        }, {resolveMsg: null, rejectMsg: '获取通知出错！！'})
+      if(res.data.length>0){
+        console.log("---------------获取通知",res.data[0].f_change_message)
+        this.notice=res.data[0].f_change_message
+      }
+
       if (this.$login && this.$login.getUrlCompileParames('name') && this.$login.getUrlCompileParames('password')) {
         this.model.ename = this.$login.getUrlCompileParames('name')
         this.model.password = this.$login.getUrlCompileParames('password')
@@ -228,7 +254,9 @@
         picLyanzhengma: '',
         // 修改密码弹框展示
         modifyPwShow: false,
-        logoandroid:false
+        logoandroid:false,
+        showus:false,
+        notice:''
       }
     },
     methods: {

package/src/components/server/PcdBuildingSelect.vue

@@ -0,0 +1,241 @@
+<template>
+  <div :class="style" v-show="show.pcdShow">
+    <label class="font_normal_body">省&nbsp;市&nbsp;区&nbsp;</label>
+    <v-select :value.sync="model.f_pcd"
+              class="select_list select"
+              enter-push
+              v-model="model.f_pcd"
+              style="width: 60%"
+              :multiple="mul"
+              @change="pcdChange"
+              :options='arrays.pcd' placeholder='选择省市区'
+              close-on-select v-el:cc>
+    </v-select>
+  </div>
+  <div :class="style" v-show="show.streetShow">
+    <label class="font_normal_body">街&emsp;&emsp;道</label>
+    <v-select :value.sync="model.f_street"
+              class="select_list select"
+              enter-push
+              v-model="model.f_street"
+              @change="streetChange"
+              style="width: 60%"
+              :multiple="mul"
+              :options='arrays.street' placeholder='选择街道'
+              close-on-select v-el:cc>
+    </v-select>
+  </div>
+  <div :class="style" v-show="show.areaShow">
+    <label class="font_normal_body">小&ensp;&ensp;&ensp;&ensp;区</label>
+    <v-select :value.sync="model.f_residential_area"
+              class="select_list select"
+              enter-push
+              v-model="model.f_residential_area"
+              style="width: 60%"
+              :multiple="mul"
+              @change="areaChange()"
+              :options='arrays.area' placeholder='选择小区'
+              close-on-select v-el:cc>
+    </v-select>
+  </div>
+  <div :class="style" v-show="show.buildingShow">
+    <label class="font_normal_body">楼&emsp;&emsp;栋</label>
+    <v-select :value.sync="model.f_building"
+              class="select_list select"
+              enter-push
+              v-model="model.f_building"
+              style="width: 60%"
+              :multiple="mul"
+              :options='arrays.building' placeholder='选择楼栋'
+              close-on-select v-el:cc>
+    </v-select>
+  </div>
+</template>
+<script>
+  import plugin from '../../plugins/GetLoginInfoService'
+  import { HttpResetClass } from 'vue-client'
+  let readyGen = async function (self) {
+    self.showComponent.find((item)=>{
+      switch(item){
+        case 'pcd': self.show.pcdShow=true; break;
+        case 'street': self.show.streetShow=true; break;
+        case 'area': self.show.areaShow=true; break;
+        case 'building': self.show.buildingShow=true; break;
+      }
+    })
+    self.arrays.pcd=[{label:'全部',value:''}]
+    if(self.show.pcdShow){
+      let HttpReset = new HttpResetClass()
+      var pcd = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
+        data: {
+          items: 'f_pcd',
+          tablename: 't_pcd',
+          condition: `f_pcd is not null group by f_pcd`,
+          orderitem: 'f_pcd'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取省市区出错!'})
+      for(var i=0;i<pcd.data.length;i++){
+        self.arrays.pcd.push({label:pcd.data[i].f_pcd,value:pcd.data[i].f_pcd})
+      }
+    }else if(self.show.streetShow){
+      console.log("------------查街道")
+      let HttpReset = new HttpResetClass()
+      var street = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
+        data: {
+          items: 'f_street',
+          tablename: 't_street',
+          condition: `f_filialeid = '${self.$login.f.orgid}' and f_street is not null group by f_street`,
+          orderitem: 'f_street'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取街道出错!'})
+      for(var i=0;i<street.data.length;i++){
+        self.arrays.street.push({label:street.data[i].f_street,value:street.data[i].f_street})
+      }
+    }else if(self.show.areaShow){
+      let HttpReset = new HttpResetClass()
+      var area = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
+        data: {
+          items: 'f_residential_area',
+          tablename: 't_area',
+          condition: `f_filialeid = '${self.$login.f.orgid}' and f_residential_area is not null group by f_residential_area`,
+          orderitem: 'f_residential_area'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取小区出错!'})
+      for(var i=0;i<area.data.length;i++){
+        self.arrays.area.push({label:area.data[i].f_residential_area,value:area.data[i].f_residential_area})
+      }
+    }
+
+
+  }
+  export default {
+    title: '省市区级联选择',
+    props: {
+      style: {
+        type: String,
+        default: 'col-sm-2 form-group'
+      },
+      mul: {
+        type: Boolean,
+        default: false
+      },
+      showComponent:{
+        default:['pcd','street','area','building']
+      }
+
+    },
+    data () {
+      return {
+        condition:'',
+        show:{
+          pcdShow:false,
+          streetShow:false,
+          areaShow:false,
+          buildingShow:false
+        },
+        arrays:{
+          pcd:[{label: '全部', value: ''}],
+          street:[{label: '全部', value: ''}],
+          area:[{label: '全部', value: ''}],
+          building:[{label: '全部', value: ''}]
+        },
+        model:{
+          f_pcd:[],
+          f_street:[],
+          f_residential_area:[],
+          f_building:[]
+        }
+
+      }
+    },
+    ready () {
+      readyGen(this)
+    },
+    methods:{
+      async pcdChange(){
+        this.arrays.street=[{label:'全部',value:''}]
+        var condition = `f_filialeid = '${this.$login.f.orgid}' and f_street is not null group by f_street`
+        let street = await this.$resetpost('rs/sql/singleTable_OrderBy', {
+          data: {
+            items: 'f_street',
+            tablename: 't_street',
+            condition: condition,
+            orderitem: 'f_street'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取街道出错'})
+        for(var i=0;i<street.data.length;i++){
+          this.arrays.street.push({label:street.data[i].f_street,value:street.data[i].f_street})
+        }
+        this.returnCondition()
+      },
+      async streetChange(){
+        this.arrays.area=[{label:'全部',value:''}]
+        var condition = `f_street = '${this.model.f_street?this.model.f_street:null}' and f_residential_area is not null group by f_residential_area`
+        let area = await this.$resetpost('rs/sql/singleTable_OrderBy', {
+          data: {
+            items: 'f_residential_area',
+            tablename: 't_area',
+            condition: condition,
+            orderitem: 'f_residential_area'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区出错'})
+        for(var i=0;i<area.data.length;i++){
+          this.arrays.area.push({label:area.data[i].f_residential_area,value:area.data[i].f_residential_area})
+        }
+        this.returnCondition()
+      },
+      async areaChange(){
+        this.building = [{label:'全部',value:''}]
+        var condition=''
+        if(this.show.areaShow){
+          condition = `f_residential_area = '${this.model.f_residential_area?this.model.f_residential_area:null}' and f_building is not null group by f_building`
+        }else{
+          condition = `f_filialeid = '${this.$login.f.orgid}' and f_building is not null group by f_building`
+        }
+        let build = await this.$resetpost('rs/sql/singleTable_OrderBy', {
+          data: {
+            items: 'f_building',
+            tablename: 't_user_address',
+            condition: condition,
+            orderitem: 'f_building'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取楼栋出错'})
+        for(var i=0;i<build.data.length;i++){
+          this.arrays.building.push({label:build.data[i].f_building,value:build.data[i].f_building})
+        }
+        this.returnCondition()
+      },
+
+      returnCondition(){
+        this.condition=''
+        if(this.model.f_pcd){
+          if(this.model.f_pcd.length>0){
+            this.condition+=` and f_pcd = '${this.model.f_pcd[0]}'`
+          }
+        }
+        if(this.model.f_street) {
+          if (this.model.f_street.length > 0) {
+            this.condition += ` and f_street = '${this.model.f_street[0]}'`
+          }
+        }
+        if(this.model.f_area) {
+          if (this.model.f_area.length > 0) {
+            this.condition += ` and f_area = '${this.model.f_area[0]}'`
+          }
+        }
+        if(this.model.f_building) {
+          if (this.model.f_building.length > 0) {
+            this.condition += ` and f_building = '${this.model.f_building[0]}'`
+          }
+        }
+        // this.$parent.setCon(this.condition)
+        this.$dispatch('setcon',this.condition)
+      }
+    },
+    watch: {
+      // 'condition'(val){
+      //
+      // }
+    }
+  }
+</script>

package/src/components/server/ResSelect.vue

@@ -3,6 +3,7 @@
             :value.sync="selectres"
             :multiple="isMul"
             search="true"
+            :disabled="mustselect"
             :close-on-select="!isMul"
             @change="resChange"
   >
@@ -33,6 +34,10 @@
         type: Array,
         default() { return [] },
       },
+      mustselect: {
+        type: Boolean,
+        default: false
+      },
     },
     data () {
       return {