system-clients 3.2.1-14 → 3.2.1-17

package/src/components/equipment/PosParamList.vue

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

@@ -1,51 +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>
+<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/server/Login.vue

@@ -103,6 +103,14 @@
                 <span >{{$login.f.deps}}</span>
               </div> -->
             </div>
+            <div class="col-sm-12 " v-if="AppDaiBan !==''">
+                <label class="col-sm-2">报装待办:</label>
+              <span style="font-weight:normal">{{AppDaiBan}}</span>
+            </div>
+            <div class="col-sm-12 " v-if="OrderDaiBan !==''">
+              <label class="col-sm-2">预约待办:</label>
+              <span style="font-weight:normal">{{OrderDaiBan}}</span>
+            </div>
           </div>
         </form>
       </article>
@@ -189,6 +197,10 @@ let saveGen = function *(self) {
       })
     } else if ((!self.otherLogin) && self.$login.depPrompt) {
       self.depPromptShow = true
+      if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
+        // 获取待办
+        self.getDaiBan()
+      }
     } else {
       self.$goto('home-page', {functions: self.$login.f})
       // if (self.otherLogin){
@@ -289,10 +301,56 @@ export default {
       logoandroid:false,
       showus:false,
       notice:'',
-      loginotherflag :true
+      loginotherflag :true,
+      // 报建待办
+      AppDaiBan: '',
+      // 预约待处理
+      OrderDaiBan: ''
     }
   },
   methods: {
+    async getDaiBan(){
+      let http = new HttpResetClass()
+      let data = {
+        condition: '1 = 1',
+        data: {
+          orgid: this.$login.f.orgid,
+          id: this.$login.f.id
+        }
+      }
+      await http.load('POST', '/rs/sql/checkuser', {data: data}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then((res) => {
+        let AppDaiBan = {}
+        res.data.forEach(item=>{
+          AppDaiBan[item.defname] = AppDaiBan[item.defname] || []
+          AppDaiBan[item.defname].push(item)
+        })
+        this.AppDaiBan = `您有${res.data.length}条需要处理的报建待办业务！`
+        if (res.data.length> 0){
+          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 != '预约失败'`
+
+        }}, {
+        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) {
         if (this.$login && this.$login.getUrlParames('name') ) {

package/src/filiale/rizhao/LeftTree.vue

@@ -1,111 +1,111 @@
-<template>
-  <div class='over' style="display: inline-block; width: 100%;">
-    <tree :model='functions' :flagres="false" :is-click="false" v-ref:tree @toggle="toggled" >
-      <span partial class="row" :class="{ 'tree-img': isFolder(row), 'tree-span': !isFolder(row) }">
-        <div class="col-sm-2" >
-          <img v-if="isFolder(row)" :src="row.data.icon" alt="">
-        </div>
-        <div class="col-sm-8" style="padding-left:6%;text-align: left">{{row.data.name}}</div>
-      </span>
-    </tree>
-  </div>
-</template>
-<script>
-  import Vue from 'vue'
-
-export default {
-  props: ['functions', 'userid','tabs'],
-  title: '左侧树菜单',
-  data () {
-    return {
-      index: -1,
-      name: null,
-      tbcg:[]
-    }
-  },
-  methods: {
-    open (row) {
-      if (row.data.name === '资源管理') {
-        this.$parent.changeMain(row.data.id)
-          return
-      }
-        console.log(row.data.navigate)
-        if (row.data.navigate) {
-
-            let isExist = false
-        this.tbcg.forEach((tab) => {
-            if(tab.comp.name == row.data.link) {
-            isExist = true
-          }
-        })
-        if (!isExist){
-          this.$goto('embbed-page', {domainName: row.data.navigate, title: row.data.name, compName: row.data.link, login: Vue.$login, param: Vue.$appdata}, 'main')
-        }else {
-            console.log(isExist,'aa')
-          this.$emit('isnodo',row.data.link)
-        }
-      } else if (row.data.link) {
-        let isExist = false
-        this.tbcg.forEach((tab) => {
-          if(tab.comp.name == row.data.link) {
-            isExist = true
-          }
-        })
-        if (!isExist){
-          this.$goto(row.data.link, {f: this.functions}, 'main')
-        }else {
-            console.log(isExist,'saaa')
-          this.$emit('isnodo',row.data.link)
-        }
-      }
-    },
-    changeSelect(name) {
-      if (!name) {
-        this.$refs.tree.selectStore.select(null)
-        return
-      }
-      this.name = name
-      let index = this.selfFindIndex(name)
-      this.index = index
-      // 当前激活页签有，index为-1，说明菜单收缩
-      this.changeSelected(index)
-    },
-    selfFindIndex (name) {
-
-      return this.$refs.tree.toNode.findIndex((item) => {
-        return item.data.link === name
-      })
-    },
-    changeSelected (index) {
-
-      if (index === -1) {
-        this.$refs.tree.selectStore.select(null)
-      }else {
-        this.$refs.tree.selectStore.select(this.$refs.tree.toNode[index])
-      }
-
-    },
-    toggled () {
-
-      if (this.name && this.index === -1) {
-        let index = this.selfFindIndex(this.name)
-        if (index !== -1) {
-          this.changeSelected(index)
-        }
-      }
-    }
-  },
-  events: {
-    'select-changed': function (data) {
-
-      // 事件回调内的 `this` 自动绑定到注册它的实例上
-      this.open(data.val)
-    }
-  },
-  watch:{
-    'tabs'(val){
-      this.tbcg = val
-    }
-  }
-}
-</script>
+<template>
+  <div class='over' style="display: inline-block; width: 100%;">
+    <tree :model='functions' :flagres="false" :is-click="false" v-ref:tree @toggle="toggled" >
+      <span partial class="row" :class="{ 'tree-img': isFolder(row), 'tree-span': !isFolder(row) }">
+        <div class="col-sm-2" >
+          <img v-if="isFolder(row)" :src="row.data.icon" alt="">
+        </div>
+        <div class="col-sm-8" style="padding-left:6%;text-align: left">{{row.data.name}}</div>
+      </span>
+    </tree>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+
+export default {
+  props: ['functions', 'userid','tabs'],
+  title: '左侧树菜单',
+  data () {
+    return {
+      index: -1,
+      name: null,
+      tbcg:[]
+    }
+  },
+  methods: {
+    open (row) {
+      if (row.data.name === '资源管理') {
+        this.$parent.changeMain(row.data.id)
+          return
+      }
+        console.log(row.data.navigate)
+        if (row.data.navigate) {
+
+            let isExist = false
+        this.tbcg.forEach((tab) => {
+            if(tab.comp.name == row.data.link) {
+            isExist = true
+          }
+        })
+        if (!isExist){
+          this.$goto('embbed-page', {domainName: row.data.navigate, title: row.data.name, compName: row.data.link, login: Vue.$login, param: Vue.$appdata}, 'main')
+        }else {
+            console.log(isExist,'aa')
+          this.$emit('isnodo',row.data.link)
+        }
+      } else if (row.data.link) {
+        let isExist = false
+        this.tbcg.forEach((tab) => {
+          if(tab.comp.name == row.data.link) {
+            isExist = true
+          }
+        })
+        if (!isExist){
+          this.$goto(row.data.link, {f: this.functions}, 'main')
+        }else {
+            console.log(isExist,'saaa')
+          this.$emit('isnodo',row.data.link)
+        }
+      }
+    },
+    changeSelect(name) {
+      if (!name) {
+        this.$refs.tree.selectStore.select(null)
+        return
+      }
+      this.name = name
+      let index = this.selfFindIndex(name)
+      this.index = index
+      // 当前激活页签有，index为-1，说明菜单收缩
+      this.changeSelected(index)
+    },
+    selfFindIndex (name) {
+
+      return this.$refs.tree.toNode.findIndex((item) => {
+        return item.data.link === name
+      })
+    },
+    changeSelected (index) {
+
+      if (index === -1) {
+        this.$refs.tree.selectStore.select(null)
+      }else {
+        this.$refs.tree.selectStore.select(this.$refs.tree.toNode[index])
+      }
+
+    },
+    toggled () {
+
+      if (this.name && this.index === -1) {
+        let index = this.selfFindIndex(this.name)
+        if (index !== -1) {
+          this.changeSelected(index)
+        }
+      }
+    }
+  },
+  events: {
+    'select-changed': function (data) {
+
+      // 事件回调内的 `this` 自动绑定到注册它的实例上
+      this.open(data.val)
+    }
+  },
+  watch:{
+    'tabs'(val){
+      this.tbcg = val
+    }
+  }
+}
+</script>