manage-client 3.3.187 → 3.3.189

package/build/dev-server.js

@@ -19,9 +19,9 @@ var qtx= 'http://36.103.222.144:6300/'
 // var bendi = 'http://203.57.101.233:8400/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://192.168.50.67:31785/'
+var bendi = 'http://192.168.50.4:8400/'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://192.168.50.67:31785/'
+var wode = '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'
@@ -30,8 +30,8 @@ var proxyTable = {
     target: bendi
   },
   '/api': {
-    target: 'http://127.0.0.1:9026',
-    pathRewrite: { '^/api/af-revenue': '/' },
+    target: 'http://192.168.50.4:8400'
+
   },
   '/rs/sql/chargeQuery_by_gasproperties': {
     target: 'http://localhost:8084/'
@@ -94,9 +94,6 @@ var proxyTable = {
   '/rs/sql/singleTable': {
     target: bendi
   },
-  '/rs/sql': {
-    target: 'http://localhost:8084/'
-  },
   '/rs': {
     target: wode
   }

package/package.json

@@ -1,111 +1,111 @@
-{
-    "name": "manage-client",
-    "version": "3.3.187",
-    "description": "经营管控模块前台组件",
-    "main": "src/index.js",
-    "directories": {
-        "test": "test"
-    },
-    "dependencies": {
-        "crypto-js": "^4.1.1",
-        "swiper": "^5.4.5"
-    },
-    "devDependencies": {
-        "axios": "0.15.3",
-        "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",
-        "co": "^4.6.0",
-        "connect-history-api-fallback": "^1.1.0",
-        "cross-env": "^1.0.7",
-        "cross-spawn": "^2.1.5",
-        "css-loader": "^0.23.0",
-        "echarts": "^4.1.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",
-        "filemanager-webpack-plugin": "^2.0.5",
-        "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",
-        "ldap-clients": "3.0.7",
-        "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",
-        "selenium-server": "2.52.0",
-        "sinon": "^2.1.0",
-        "sinon-chai": "^2.8.0",
-        "style": "0.0.3",
-        "style-loader": "^0.20.3",
-        "swiper": "^5.4.5",
-        "system-clients": "3.2.61",
-        "url-loader": "^0.5.7",
-        "vue-amap": "0.5.10",
-        "vue-client": "1.24.141",
-        "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",
-        "webpack-parallel-uglify-plugin": "^1.0.0"
-    },
-    "scripts": {
-        "unit": "karma start test/unit/karma.conf.js --single-run",
-        "example": "node build/example-server.js",
-        "dev": "node build/dev-server.js",
-        "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-        "oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
-        "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-        "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-        "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-        "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-        "e2e": "node test/e2e/runner.js",
-        "release": "bash build/release.sh"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://gitee.com/aote/management_modules.git"
-    },
-    "keywords": [
-        "manage"
-    ],
-    "author": "liuxudong",
-    "license": "ISC"
-}
+{
+    "name": "manage-client",
+    "version": "3.3.189",
+    "description": "经营管控模块前台组件",
+    "main": "src/index.js",
+    "directories": {
+        "test": "test"
+    },
+    "dependencies": {
+        "crypto-js": "^4.1.1",
+        "swiper": "^5.4.5"
+    },
+    "devDependencies": {
+        "axios": "0.15.3",
+        "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",
+        "co": "^4.6.0",
+        "connect-history-api-fallback": "^1.1.0",
+        "cross-env": "^1.0.7",
+        "cross-spawn": "^2.1.5",
+        "css-loader": "^0.23.0",
+        "echarts": "^4.1.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",
+        "filemanager-webpack-plugin": "^2.0.5",
+        "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",
+        "ldap-clients": "3.0.7",
+        "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",
+        "selenium-server": "2.52.0",
+        "sinon": "^2.1.0",
+        "sinon-chai": "^2.8.0",
+        "style": "0.0.3",
+        "style-loader": "^0.20.3",
+        "swiper": "^5.4.5",
+        "system-clients": "3.2.61",
+        "url-loader": "^0.5.7",
+        "vue-amap": "0.5.10",
+        "vue-client": "1.24.141",
+        "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",
+        "webpack-parallel-uglify-plugin": "^1.0.0"
+    },
+    "scripts": {
+        "unit": "karma start test/unit/karma.conf.js --single-run",
+        "example": "node build/example-server.js",
+        "dev": "node build/dev-server.js",
+        "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+        "oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
+        "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+        "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+        "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+        "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+        "e2e": "node test/e2e/runner.js",
+        "release": "bash build/release.sh"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://gitee.com/aote/management_modules.git"
+    },
+    "keywords": [
+        "manage"
+    ],
+    "author": "liuxudong",
+    "license": "ISC"
+}

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

@@ -294,7 +294,7 @@
     </div>
     <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
       <article slot="modal-body">
-        <upload :blodid="selected.f_userinfo_id" v-ref:upload isupload="false" takeimg="false"  fusetype="补气" :isremark="false" style="width:auto" ></upload>
+        <upload :businessid="selected.id" v-ref:upload isupload="false" takeimg="false"  fusetype="补气" :isremark="false" style="width:auto" ></upload>
       </article>
       <footer slot="modal-footer" class="modal-footer">
       </footer>

package/src/filiale/kelai/GasStatistics.vue

@@ -459,13 +459,13 @@ export default {
     getCondition() {
       let f_user_type = '1=1'
       if(this.$refs.paged.$refs.criteria.model.f_user_type){
-        this.model.params.f_user_type = `f_user_type ='${this.$refs.paged.$refs.criteria.model.f_user_type}'`
+        f_user_type = `f_user_type ='${this.$refs.paged.$refs.criteria.model.f_user_type}'`
       }
       return {
         condition: this.condition,
         startDate:`${this.$refs.paged.$refs.criteria.model.startDate}`,
         endDate:`${this.$refs.paged.$refs.criteria.model.endDate}`,
-        f_user_type:f_user_type
+        f_user_type: f_user_type
       }
     },
     getstart(){

package/src/filiale/shanxian/EchartsBox.vue

@@ -32,7 +32,7 @@
                       @res-select="getRes"
                       :initresid="model.id">
           </res-select>
-          <button class="button_search button_spacing" @click="changePage()">下一页</button>
+         <button class="button_search button_spacing" @click="changePage()">下一页</button>
         </div>
       </div>
     </div>
@@ -67,7 +67,7 @@
       </div>
     </div>
     <div style="height: 97%;" v-if="showPage === 2">
-      <iframe src="http://119.187.112.234:9528/#/delink?link=Y8I%2FK%2FiIq6HlCQCQx8xG%2FeAj2GQ%2Fg1nl7jXauckQJhZrEPV%2BRkyF3HthpF4LVC8pS6MDn5%2BLiEM7mYEgROEQtQ&user=qDn45GDQ0K0EVNcpZy2VoQxHult9RhbeRPXLrq%2BCQz152dmng0uyBYBWn7EjcF2YwD44XdF0gda5h6oFHwJqkg"
+      <iframe src="http://119.187.112.234:9528/#/delink?link=Xun1W4ColEjaBrsR7uQqq%2FlLRaqpur8ZLnbuwSovQJxkK%2F%2Bqs7bEbonCchQM%2BGwmojs%2BbvtBuc9zdBl3miXOZQ&user=yrh0a7xtbSypdtka86RCIhSxZUjIWE688Z%2BWgADSW%2BqCmrEPVvMXYtymOZkdto39pSXjNdw%2BOe25pTYGZkNuMw"
               width="100%" height="100%" style="border: none;" ></iframe>
       <!--      <div class="flex-row" style="flex: 1;height: 96%">-->
       <!--        <div style="flex: 1">-->

package/src/filiale/tongchuan/GasInspection.vue

@@ -261,6 +261,12 @@
             <th><nobr>最后抄表日期</nobr></th>
             <th><nobr>用气量</nobr></th>
             <th><nobr>用气金额</nobr></th>
+            <th><nobr>一阶气量</nobr></th>
+            <th><nobr>一阶金额</nobr></th>
+            <th><nobr>二阶气量</nobr></th>
+            <th><nobr>二阶金额</nobr></th>
+            <th><nobr>三阶气量</nobr></th>
+            <th><nobr>三阶金额</nobr></th>
             <th><nobr>欠费月数</nobr></th>
             <th><nobr>欠费条数</nobr></th>
             <th><nobr>欠费月平均气量</nobr></th>
@@ -291,6 +297,14 @@
           <th style="text-align: center;"><nobr>{{row.end_time}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_oughtamount}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_oughtfee}}</nobr></th>
+
+          <th style="text-align: center;"><nobr>{{row.f_stair_gas1}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_stair_money1}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_stair_gas2}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_stair_money2}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_stair_gas3}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_stair_money3}}</nobr></th>
+
           <th style="text-align: center;"><nobr>{{row.qianfei_month_num}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.qianfei_num}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.qianfei_avg_gas}}</nobr></th>
@@ -304,6 +318,14 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #f2f6fa;padding: 0px 10px 0px 10px;font-weight: bold">总用气量:&emsp;&emsp;{{sumsmodel.f_oughtamount}}</td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总用气金额:&emsp;&emsp;{{sumsmodel.f_oughtfee}}</td>
+
+            <td style="display: inline-block;width: auto;border-right: 1px solid #f2f6fa;padding: 0px 10px 0px 10px;font-weight: bold">一阶气量:&emsp;&emsp;{{sumsmodel.f_stair_gas1}}</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">一阶金额:&emsp;&emsp;{{sumsmodel.f_stair_money1}}</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #f2f6fa;padding: 0px 10px 0px 10px;font-weight: bold">二阶气量:&emsp;&emsp;{{sumsmodel.f_stair_gas2}}</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">二阶金额:&emsp;&emsp;{{sumsmodel.f_stair_money2}}</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #f2f6fa;padding: 0px 10px 0px 10px;font-weight: bold">三阶气量:&emsp;&emsp;{{sumsmodel.f_stair_gas3}}</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">三阶金额:&emsp;&emsp;{{sumsmodel.f_stair_money3}}</td>
+
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总欠费条数:&emsp;&emsp;{{sumsmodel.qianfei_num}}</td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总欠费气量:&emsp;{{sumsmodel.f_totalowe_gas}}</td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总欠费金额:&emsp;{{sumsmodel.f_totalowe_fee}}</td>
@@ -348,6 +370,12 @@
         model: new PagedList('api/af-revenue/sql/getGasInspection', 50,{mycondition:'this.model.model.mycondition'},{
           f_oughtamount:0,
           f_oughtfee:0,
+          f_stair_gas1:0,
+          f_stair_money1:0,
+          f_stair_gas2:0,
+          f_stair_money2:0,
+          f_stair_gas3:0,
+          f_stair_money3:0,
           qianfei_num:0,
           f_totalowe_gas:0,
           f_totalowe_fee:0
@@ -622,6 +650,12 @@
           'f_meter_base': '表底数',
           'f_oughtamount': '用气量',
           'f_oughtfee': '用气金额',
+          'f_stair_gas1': '一阶气量',
+          'f_stair_money1': '一阶金额',
+          'f_stair_gas2': '二阶气量',
+          'f_stair_money2': '二阶金额',
+          'f_stair_gas3': '三阶气量',
+          'f_stair_money3': '三阶金额',
           'qianfei_month_num': '欠费月数',
           'qianfei_num': '欠费条数',
           'qianfei_avg_gas': '欠费月平均气量',

package/.npmignore

@@ -1,10 +0,0 @@
-src/bootstrap
-.idea/
-.DS_Store
-node_modules/
-dist/static/*.map
-npm-debug.log
-selenium-debug.log
-test/unit/coverage
-test/e2e/reports
-yarn.lock

package/build/.npmignore

@@ -1 +0,0 @@
-