system-clients 3.2.70 → 3.2.72-yc

package/src/components/List.vue

@@ -1,51 +1,51 @@
-<template>
-  <div class="flex">
-    <div class="auto">
-      <ul class="nav nav-tabs">
-        <li role="presentation"  @click="h1()" id="1"><a href="#">档案</a></li>
-        <li role="presentation" @click="h2()" id="2"><a href="#">小区-地址</a></li>
-        <li role="presentation"  @click="h3()" id="3"><a href="#">单位-地址</a></li>
-      </ul>
-    </div>
-    <div style="margin-top:10px;" id="hh" class="span">
-      <route :comp="{name: 'civil-search'}" v-if = "r1"></route>
-      <route :comp="{name: 'Address-search'}" v-if = "r2"></route>
-      <route :comp="{name: 'unit-search'}" v-if = "r3"></route>
-    </div>
-  </div>
-</template>
-<script>
-/**
-*档案管理查询列表
-*/
-export default {
-  title: '档案管理',
-  data () {
-    return {
-      r1: true,
-      r2: false,
-      r3: false
-    }
-  },
-  methods: {
-    h1 () {
-      this.r1 = true
-      this.r2 = false
-      this.r3 = false
-      this.r4 = false
-    },
-    h2 () {
-      this.r1 = false
-      this.r2 = true
-      this.r3 = false
-      this.r4 = false
-    },
-    h3 () {
-      this.r1 = false
-      this.r2 = false
-      this.r3 = true
-      this.r4 = false
-    }
-  }
-}
-</script>
+<template>
+  <div class="flex">
+    <div class="auto">
+      <ul class="nav nav-tabs">
+        <li role="presentation"  @click="h1()" id="1"><a href="#">档案</a></li>
+        <li role="presentation" @click="h2()" id="2"><a href="#">小区-地址</a></li>
+        <li role="presentation"  @click="h3()" id="3"><a href="#">单位-地址</a></li>
+      </ul>
+    </div>
+    <div style="margin-top:10px;" id="hh" class="span">
+      <route :comp="{name: 'civil-search'}" v-if = "r1"></route>
+      <route :comp="{name: 'Address-search'}" v-if = "r2"></route>
+      <route :comp="{name: 'unit-search'}" v-if = "r3"></route>
+    </div>
+  </div>
+</template>
+<script>
+/**
+*档案管理查询列表
+*/
+export default {
+  title: '档案管理',
+  data () {
+    return {
+      r1: true,
+      r2: false,
+      r3: false
+    }
+  },
+  methods: {
+    h1 () {
+      this.r1 = true
+      this.r2 = false
+      this.r3 = false
+      this.r4 = false
+    },
+    h2 () {
+      this.r1 = false
+      this.r2 = true
+      this.r3 = false
+      this.r4 = false
+    },
+    h3 () {
+      this.r1 = false
+      this.r2 = false
+      this.r3 = true
+      this.r4 = false
+    }
+  }
+}
+</script>

package/src/components/Main.vue

@@ -140,6 +140,26 @@
       </footer>
     </modal>
 
+    <modal v-show="showRemind" :show.sync="showRemind" :backdrop="false">
+      <header slot="modal-header" class="text-center"><h3>卡表动态库到期</h3></header>
+      <article slot="modal-body" class="modal-body">
+        <form class="form-horizontal">
+          <div class="row">
+            <div class="col-sm-3 " v-for="item in dataRemind">
+              <label class="col-sm-3">{{ item.type }}:</label>
+              <span style="font-weight:normal">{{item.brand}}</span>
+            </div>
+            <div class="col-sm-12 text-right">
+              <span style="font-weight:normal">卡表动态库到期,请联系售后尽快注册！</span>
+            </div>
+          </div>
+        </form>
+      </article>
+      <footer  slot="modal-footer" style="height: 8vh" class="modal-footer">
+        <button class="button_search" @click="showRemind = false">确认</button>
+      </footer>
+    </modal>
+
     <!-- 变更录入 模态框 -->
     <add-changemsg :show="AddChangeMsgShow" v-on:toggle="AddChangeMsgShow = false"></add-changemsg>
     <!-- 修改密码组件 -->
@@ -246,6 +266,9 @@ let createWaterMark = function (userName) {
         setting: true,
         srcsetting: '../../static/newStyle/setting.png',
         showwatermakeflag: false,
+        gasbrandIdData: [],
+        showRemind: false,
+        dataRemind: [],
         // headerHint: true, // 右侧顶部提示信息
         // value: 25645.26,
         // AddChangeMsgShow: false,
@@ -312,6 +335,8 @@ let createWaterMark = function (userName) {
       if (this.config.approve) {
         this.getFlowList()
       }
+      // 获取卡表动态库到期时间
+      this.getExpireDate()
     },
     methods: {
       getOrderList(){
@@ -325,7 +350,6 @@ let createWaterMark = function (userName) {
           console.log('捕获到异常', error)
         }
       },
-      // 获取审核待办
       getFlowList(){
         console.log('======获取流程审核待办=====')
         let times = this.config.approveTimes * 60 * 1000
@@ -338,16 +362,6 @@ let createWaterMark = function (userName) {
           console.log('捕获到异常', error)
         }
       },
-      getTimesgotoWorkOrderSite(){
-        let teltimes = 2*60*1000 // 两分钟
-        try {
-          this.intervaltx =setInterval(()=>{
-            this.gotoWorkOrderSite()
-          },teltimes)
-        }catch (e) {
-          console.log('捕获到异常', e)
-        }
-      },
       async getFlowDaiBan(){
         this.flowDaiBan = ''
         let http = new HttpResetClass()
@@ -369,6 +383,16 @@ let createWaterMark = function (userName) {
           this.newTipShow = true
         }
       },
+      getTimesgotoWorkOrderSite(){
+        let teltimes = 2*60*1000 // 两分钟
+        try {
+          this.intervaltx =setInterval(()=>{
+            this.gotoWorkOrderSite()
+          },teltimes)
+        }catch (e) {
+          console.log('捕获到异常', e)
+        }
+      },
       async getDaiBan(){
         this.OrderDaiBan  = ''
         this.AppDaiBan  = ''
@@ -417,6 +441,58 @@ let createWaterMark = function (userName) {
           this.newTipShow = true
         }
       },
+      // 获取动态库卡表到期日
+      async getExpireDate(){
+        // 获取分公司的表品牌id
+        let http = new HttpResetClass()
+        await http.load('POST', '/rs/sql/singleTable', {data: {
+            tablename:'t_gasbrand_orgid',
+            condition:`f_using_orgid ='${this.$login.f.orgid}'`
+          }}, {
+          resolveMsg: null,
+          rejectMsg: null
+        }).then((res) => {
+          if (res.data.length > 0) {
+            res.data.forEach(item => {
+              this.gasbrandIdData.push(item.f_gasbrand_id)
+            })
+          }
+          if (this.gasbrandIdData.length > 0) {
+            // 获取卡表到期时间
+            http.load('POST', '/rs/sql/singleTable', {data: {
+                tablename:'t_gasbrand',
+                condition:`id in (${this.gasbrandIdData}) and f_meter_type like '%卡表%'`
+              }}, {
+              resolveMsg: null,
+              rejectMsg: null
+            }).then((res) => {
+              if (res.data.length > 0) {
+                res.data.forEach(itre => {
+                  let band = null
+                  if ('f_dynamic_expire' in itre) {
+                      console.log(itre.f_dynamic_expire)
+                      if (itre.f_dynamic_expire !== null && itre.f_dynamic_expire !== '') {
+                        let todayold =  new Date(itre.f_dynamic_expire)
+                        todayold.setDate(todayold.getDate() - parseInt(this.$appdata.getSingleValue('动态库提醒天数设置')))
+                        let today = new Date()
+                        if (today > todayold) {
+                            band = {type:'卡表',brand:itre.f_meter_brand}
+                            this.dataRemind.push(band)
+                        }
+                      }
+                  }
+                })
+
+              }
+              if (this.dataRemind.length > 0) {
+                this.showRemind = true
+                // this.$showMessage(band + '。' +
+                //   '卡表动态库到期,请联系售后尽快注册！')
+              }
+            })
+          }
+        })
+      },
       // 提醒框被点击
       tipClick(){
         this.newTipShow = false

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>