system-clients 3.2.71 → 3.2.73

package/package.json

@@ -1,105 +1,105 @@
-{
-  "name": "system-clients",
-  "version": "3.2.71",
-  "description": "系统基础框架",
-  "main": "src/index.js",
-  "directories": {
-    "doc": "doc",
-    "example": "examples",
-    "test": "test"
-  },
-  "scripts": {
-    "example": "node build/example-server.js",
-    "dev": "node build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "unit": "karma start test/unit/karma.conf.js",
-    "makeall": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_OPTIONS=--max_old_space_size=4096 NODE_ENV=production webpack --progress --hide-modules --config build/webpack.example.conf.js",
-    "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
-  },
-  "dependencies": {
-    "base64-js": "^1.3.0",
-    "js-base64": "^2.4.9",
-    "less": "^2.7.1",
-    "less-loader": "^2.2.3",
-    "nyc": "^15.1.0",
-    "src": "^1.1.2",
-    "vue": "^1.0.17"
-  },
-  "devDependencies": {
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "jsencrypt": "^3.0.0-rc.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "manage-client": "^1.4.20",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "rimraf": "^2.5.0",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.24.79",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
-    "webpack": "^1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aotu/System"
-  },
-  "keywords": [
-    "system_clients"
-  ],
-  "author": "杨文宇",
-  "license": "ISC"
-}
+{
+  "name": "system-clients",
+  "version": "3.2.73",
+  "description": "系统基础框架",
+  "main": "src/index.js",
+  "directories": {
+    "doc": "doc",
+    "example": "examples",
+    "test": "test"
+  },
+  "scripts": {
+    "example": "node build/example-server.js",
+    "dev": "node build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "unit": "karma start test/unit/karma.conf.js",
+    "makeall": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_OPTIONS=--max_old_space_size=4096 NODE_ENV=production webpack --progress --hide-modules --config build/webpack.example.conf.js",
+    "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
+  },
+  "dependencies": {
+    "base64-js": "^1.3.0",
+    "js-base64": "^2.4.9",
+    "less": "^2.7.1",
+    "less-loader": "^2.2.3",
+    "nyc": "^15.1.0",
+    "src": "^1.1.2",
+    "vue": "^1.0.17"
+  },
+  "devDependencies": {
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "jsencrypt": "^3.0.0-rc.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "manage-client": "^1.4.20",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "rimraf": "^2.5.0",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.24.79",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "2.1.7",
+    "webpack": "^1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aotu/System"
+  },
+  "keywords": [
+    "system_clients"
+  ],
+  "author": "杨文宇",
+  "license": "ISC"
+}

package/src/App.vue

@@ -1,24 +1,24 @@
-<template>
-  <app-base class="bg">
-    <div class='flex'>
-      <article>
-        <!--<route :comp="{name: 'check-model'}"></route>-->
-        <!--<route :comp="{name: 'vender-management'}"></route>-->
-        <route :comp="{name: 'login'}"></route>
-        <!-- <route :comp="{name: 'load-data'}"></route> -->
-        <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
-        <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
-      </article>
-    </div>
-  </app-base>
-</template>
-
-<script>
-// import cardListen from './plugins/CardListen'
-
-export default {
-  // ready () {
-  //   cardListen.startListen()
-  // }
-}
-</script>
+<template>
+  <app-base class="bg">
+    <div class='flex'>
+      <article>
+        <!--<route :comp="{name: 'check-model'}"></route>-->
+        <!--<route :comp="{name: 'vender-management'}"></route>-->
+        <route :comp="{name: 'login'}"></route>
+        <!-- <route :comp="{name: 'load-data'}"></route> -->
+        <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
+        <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
+      </article>
+    </div>
+  </app-base>
+</template>
+
+<script>
+// import cardListen from './plugins/CardListen'
+
+export default {
+  // ready () {
+  //   cardListen.startListen()
+  // }
+}
+</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