manage-client 3.2.74 → 3.2.76-jb

package/build/dev-server.js

@@ -10,78 +10,78 @@ var compiler = webpack(config)
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-// var bendi = 'http://127.0.0.1:8089/manage', system = 'http://36.103.224.217:6300/'
+// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
 var shaoguan='http://119.146.1.106:8300/'
 var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://127.0.0.1:8090'
+var bendi = 'http://114.117.163.208:8600/#'
 // var bendi = 'http://172.168.1.11:9001'
-var system = 'http://192.168.17.52:8600'
-// var system = 'http://172.168.1.11:9001'
+var fuwu = 'http://114.117.163.208:8600/#'
+// var fuwu = 'http://172.168.1.11:9001'
 var system = 'http://192.168.50.4:8400'
 //192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
 var proxyTable = {
   '/rs/logic/exportfile': {
-    target: system
+    target: fuwu
   },
   '/files': {
-    target: system
+    target: fuwu
   },
   // 查找资源服务数据
   '/rs/search': {
-    target: system
+    target: fuwu
   },
   // 查找资源服务数据
   '/rs/logic/getLogin': {
-    target: system
+    target: fuwu
   },
   // 查找资源服务数据
   '/rs/logic/getInitData': {
-    target: system
+    target: fuwu
   },
   '/rs/logic/getSaleInitData':{
-    target: system
+    target: fuwu
   },
   // 用户登录服务地址
   '/rs/user': {
-    target: system
+    target: fuwu
   },
   '/rs/path/getParams': {
-    target: system
+    target: fuwu
   },
   '/rs/data': {
-    target: system
+    target: fuwu
   },
   '/rs/license': {
-    target: system
+    target: fuwu
   },
   '/rs/db': {
-    target: system
+    target: fuwu
   },
   '/excel': {
-    target: system
+    target: fuwu
   },
   '/rs/config': {
-    target: system
+    target: fuwu
   },
   '/rs/sql/getLicenseById': {
-    target: system
+    target: fuwu
   },
   '/rs/report': {
     target: bendi
   },
   '/rs/vue': {
-    target: system
+    target: fuwu
   },
   '/rs/file': {
     target: bendi
   },
-  '/rs/logic/SumSettleFileImport': {
-    target: 'http://127.0.0.1:8080'
-  },
+  // '/rs/logic/SumSettleFileImport': {
+  //   target: 'http://127.0.0.1:8080'
+  // },
   '/rs': {
-    target: system
+    target: bendi
   }
 }
 

package/package.json

@@ -1,14 +1,17 @@
 {
   "name": "manage-client",
-  "version": "3.2.74",
+  "version": "3.2.76-jb",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
     "test": "test"
   },
-  "dependencies": {},
+  "dependencies": {
+    "crypto-js": "^4.1.1",
+    "swiper": "^5.4.5"
+  },
   "devDependencies": {
-    "axios": "^0.21.1",
+    "axios": "0.15.3",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",
     "babel-plugin-transform-runtime": "^6.0.0",
@@ -32,6 +35,7 @@
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.13.3",
     "extract-text-webpack-plugin": "^1.0.1",
+    "filemanager-webpack-plugin": "^2.0.5",
     "file-loader": "^0.8.4",
     "function-bind": "^1.0.2",
     "html-webpack-plugin": "^2.8.1",
@@ -50,23 +54,24 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.28",
+    "ldap-clients": "3.0.60",
     "less": "^2.7.3",
     "mkdirp": "^0.5.1",
     "mocha": "^3.2.0",
     "moment": "2.24.0",
     "ncp": "^2.0.0",
     "rimraf": "^2.5.0",
-    "sale-client": "3.4.14",
+    "sale-client": "3.4.121-jb",
     "selenium-server": "2.52.0",
     "sinon": "^2.1.0",
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.1.89-20",
+    "swiper": "^5.4.5",
+    "system-clients": "3.2.68",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",
-    "vue-client": "1.24.33",
+    "vue-client": "1.24.93",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "8.2.1",
@@ -78,7 +83,8 @@
     "webpack": "1.12.2",
     "webpack-dev-middleware": "^1.4.0",
     "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3"
+    "webpack-merge": "^0.8.3",
+    "webpack-parallel-uglify-plugin": "^1.0.0"
   },
   "scripts": {
     "unit": "karma start test/unit/karma.conf.js --single-run",

package/src/App.vue

@@ -1,28 +1,71 @@
-<template>
-  <div>
-    <app-base class="bg">
-      <div class='flex'>
-        <article>
-          <!--<route :comp="{name: 'liaoyuan-manage-home'}"></route>-->
-          <!--<route :comp="{name: 'meter-reading'}"></route>-->
-          <!--<route :comp="{name: 'Gasproperties'}"></route>-->
-          <!--<route :comp="{name: 'vender-management'}"></route>-->
-          <!--<route :comp="{name: 'malfunction-home'}"></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>
-  </div>
-</template>
-
-<script>
-
-
-export default {
-
-
-}
-</script>
+<template>
+  <div>
+    <app-base class="bg">
+      <div class='flex'>
+        <article>
+          <!--<route :comp="{name: 'liaoyuan-manage-home'}"></route>-->
+          <!--<route :comp="{name: 'meter-reading'}"></route>-->
+          <!--<route :comp="{name: 'Gasproperties'}"></route>-->
+          <!--<route :comp="{name: 'vender-management'}"></route>-->
+          <!--<route :comp="{name: 'malfunction-home'}"></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>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue'
+
+export default {
+  data () {
+    return {
+      lastTime: null, // 最后一次点击的时间
+      currentTime: null, // 当前点击的时间
+      // 获取一次不在获取控制
+      getConfig: false,
+      config: {
+        timeOut: 0, // 单位: 分钟
+        exitPrompt: '因您长时间未操作, 请重新登陆!'
+      },
+    }
+  },
+  ready () {
+    Vue.mmType = 'nginx'
+    Vue.HWQMM = [51, 150, 231, 300, 565, 708, 721, 952, 738, 560, 935, 912, 1274, 1148, 840, 1440]
+  },
+  created () {
+    this.lastTime = new Date().getTime()
+  },
+  methods: {
+    async isTimeOut () {
+      // 获取config配置
+      if (!this.getConfig && this.$login.f && this.$login.f.dir) {
+        await this.$getConfig(this, 'App')
+        this.getConfig = true
+      }
+      // 无配置,不开启
+      if (this.config.timeOut <= 0) return
+      // 记录这次点击的时间
+      this.currentTime = new Date().getTime()
+      // 判断上次最后一次点击的时间和这次点击的时间间隔是否大于超时时间
+      if (this.currentTime - this.lastTime > (this.config.timeOut * 60 * 1000)) {
+        // 如果是登录状态
+        if (this.$login.f.id) {
+          await this.$showMessage(this.config.exitPrompt)
+          window.location.reload()
+        } else {
+          this.lastTime = new Date().getTime()
+        }
+      } else {
+        // 如果在超时时间内点击，则把这次点击的时间记录覆盖掉之前存的最后一次点击的时间
+        this.lastTime = new Date().getTime()
+      }
+    }
+  }
+}
+</script>

package/src/components/sale/businessquery/overDueQuery.vue

@@ -104,6 +104,12 @@
                 <th>
                   <nobr>减免金额</nobr>
                 </th>
+                <th>
+                  <nobr>优惠前金额</nobr>
+                </th>
+                <th>
+                  <nobr>优惠后金额</nobr>
+                </th>
                 <th>
                   <nobr>备注</nobr>
                 </th>
@@ -141,6 +147,12 @@
               <td style="text-align: center;">
                 <nobr>{{0-row.f_latefee_ought}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_overdue.toFixed(2)}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{(row.f_overdue.toFixed(2)-(0-row.f_latefee_ought.toFixed(2))).toFixed(2)}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_comments}}</nobr>
               </td>