manage-client 3.3.191 → 3.3.192-2

package/package.json

@@ -1,111 +1,111 @@
-{
-    "name": "manage-client",
-    "version": "3.3.191",
-    "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.192-2",
+    "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/webmeter/newwebmeter/WebhandMonthGas.vue

@@ -31,7 +31,7 @@
                   <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
                   <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
                                 :field="$parent.$parent.getfield" :header="$parent.$parent.other"
-                                sqlurl="rs/easyExcel/exportExcel" sql-name="GetWebhandMonthGas" template-name='物联用户月度结算查询导出'
+                                sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="GetWebhandMonthGas" template-name='物联用户月度结算查询导出'
                                 :choose-col="true"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
                               :defaultfield="$parent.$parent.defaultfield" print-name="物联用户月度结算查询打印"
@@ -310,7 +310,7 @@ let readySomething = async function (self) {
   self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
   await self.$MagLoadParams.loadParam()
   await self.initParams()
-  await self.$getConfig(self, 'WebHandplanMonthQuery')
+  // await self.$getConfig(self, 'WebHandplanMonthQuery')
   self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
 }
 export default {
@@ -322,11 +322,9 @@ export default {
       other:[],
       footer:[],
       data: {},
-      orderitem:'f_userinfo_code desc',
       model: new PagedList('api/af-revenue/sql/GetWebhandMonthGas', 20, {
         startDate: 'this.model.handStartDate',
-        endDate: 'this.model.handEndDate',
-        orderitem:  'f_userinfo_code desc'
+        endDate: 'this.model.handEndDate'
       }, {
         f_oughtamount: 0,
         f_oughtfee: 0
@@ -639,7 +637,7 @@ export default {
     put() {
       // 对Modelval进行排序
       this.sortModelval()
-      this.thead = `<tr><th colspan=${this.modelval.length}>抄表查询统计报表</th></tr><tr>`
+      this.thead = `<tr><th colspan=${this.modelval.length}>物联用户月度结算查询</th></tr><tr>`
       for (let key of this.modelval) {
         this.thead += '<th>' + this.fields[key] + '</th>'
       }
@@ -739,10 +737,9 @@ export default {
 
     getCondition() {
       return {
-        startDate: this.$refs.paged.$refs.cri.model.startDate,
-        endDate: this.$refs.paged.$refs.cri.model.endDate,
-        condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgcondition,
-        orderitem: this.orderitem ? `${this.orderitem}` : " f_userinfo_code desc"
+        startDate: this.$refs.paged.$refs.cri.model.handStartDate,
+        endDate: this.$refs.paged.$refs.cri.model.handEndDate,
+        condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgcondition
       }
     },
     getfield() {