manage-client 1.22.15-ca → 1.22.18-ca

package/.npmignore

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

package/build/.npmignore

@@ -0,0 +1 @@
+

package/client.iml

@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="EclipseModuleManager">
-    <conelement value="org.springsource.ide.eclipse.gradle.classpathcontainer" />
-    <src_description expected_position="0" />
-  </component>
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/bin" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="library" exported="" name="org.springsource.ide.eclipse.gradle.classpathcontainer" level="application" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="EclipseModuleManager">
+    <conelement value="org.springsource.ide.eclipse.gradle.classpathcontainer" />
+    <src_description expected_position="0" />
+  </component>
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/bin" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="library" exported="" name="org.springsource.ide.eclipse.gradle.classpathcontainer" level="application" />
+  </component>
 </module>

package/package.json

@@ -1,96 +1,96 @@
-{
-  "name": "manage-client",
-  "version": "1.22.15-ca",
-  "description": "经营管控模块前台组件",
-  "main": "src/index.js",
-  "directories": {
-    "test": "test"
-  },
-  "dependencies": {},
-  "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",
-    "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",
-    "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",
-    "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",
-    "less": "^2.7.3",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "ncp": "^2.0.0",
-    "rimraf": "^2.5.0",
-    "sale-clients": "0.0.6",
-    "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": "1.7.6",
-    "url-loader": "^0.5.7",
-    "vue-client": "^1.21.1",
-    "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"
-  },
-  "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",
-    "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",
-    "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": "1.22.18-ca",
+  "description": "经营管控模块前台组件",
+  "main": "src/index.js",
+  "directories": {
+    "test": "test"
+  },
+  "dependencies": {},
+  "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",
+    "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",
+    "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",
+    "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",
+    "less": "^2.7.3",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "ncp": "^2.0.0",
+    "rimraf": "^2.5.0",
+    "sale-clients": "0.0.6",
+    "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": "1.7.6",
+    "url-loader": "^0.5.7",
+    "vue-client": "^1.21.1",
+    "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"
+  },
+  "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",
+    "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",
+    "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/MeterManage/LiushuiQuery.vue

@@ -1,169 +1,169 @@
-<template >
-  <div id="stand-work-list" class="flex bg-white p-10">
-      <criteria-paged :model="model" v-ref:paged  >
-        <criteria partial='criteria' v-ref:criteria  @condition-changed='$parent.search'>
-          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-            <div class="row" width="100%">
-              <div class="col-sm-4" >
-                <label class="font_normal_body" style="width: 40%;">&nbsp;开始时间</label>
-                <datepicker placeholder="起始时间" style="width:60%"
-                            :value.sync="model.f_start_date"
-                            v-model="model.f_start_date"
-                            :format="'yyyy-MM-dd'"
-                            condition="f_operate_date >= to_date('{} 00:00:00','yyyy-mm-dd hh24:mi:ss')"
-                ></datepicker>
-              </div>
-              <div class="col-sm-4"  >
-                <label class="font_normal_body"  style="width: 40%;">结束时间</label>
-                <datepicker placeholder="结束时间" style="width:60%"
-                            :value.sync="model.f_end_date"
-                            v-model="model.f_end_date"
-                            :format="'yyyy-MM-dd'"
-                            condition="f_operate_date <= to_date('{} 23:59:59','yyyy-mm-dd hh24:mi:ss')"
-                ></datepicker>
-              </div>
-              <div class=" col-sm-4">
-                <label class="font_normal_body " style="width: 40%;" >售气公司</label>
-                <v-select :value.sync="model.f_filiale"
-                          v-model="model.f_filiale"
-                          style="width:60%"
-                          :options='$parent.$parent.f_filiale' placeholder='请选择'
-                          condition="f_filiale = '{}'"
-                          close-on-select></v-select>
-                <!--<input-->
-                <!--type="text"-->
-                <!--class="form-control" style="width: 60%"-->
-                <!--v-model="model.f_filiale"-->
-                <!--condition="f_filiale like '%{}%'"-->
-                <!--placeholder="售气公司"-->
-                <!--/>-->
-              </div>
-              <div class="col-sm-4">
-                <label class="font_normal_body "  style="width: 40%;">售气部门</label>
-                <v-select :value.sync="model.f_outlets"
-                          v-model="model.f_outlets"
-                          style="width:60%"
-                          :options='$parent.$parent.selldep' placeholder='请选择'
-                          condition="f_outlets = '{}'"
-                          close-on-select></v-select>
-                <!--<input-->
-                <!--type="text"-->
-                <!--class="form-control" style="width: 60%"-->
-                <!--v-model="model.f_outlets"-->
-                <!--condition="f_outlets like '%{}%'"-->
-                <!--placeholder="售气部门"-->
-                <!--/>-->
-              </div>
-              <div class="span" style="float:right;">
-                <button class="btn btn-success"  @click="search()" v-el:cba>查询</button>
-              </div>
-            </div>
-          </div>
-        </criteria>
-        <data-grid :model="model" partial='list' v-ref:grid>
-          <template partial='head'>
-            <tr>
-              <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>
-            </tr>
-          </template>
-          <template partial='body' partial='list' v-ref:grid>
-            <tr >
-              <td style="text-align:center">{{row.f_operat_type}}</td>
-              <td style="text-align:center">{{row.type}}</td>
-              <td style="text-align:center">{{row.gas}}</td>
-              <td style="text-align:center">{{row.fee}}</td>
-              <td style="text-align:center">{{row.f_operator}}</td>
-              <td style="text-align:center">{{row.op_spot}}</td>
-              <td style="text-align:center">{{row.f_operate_date}}</td>
-              <td style="text-align:center">{{row.f_filiale}}</td>
-              <td style="text-align:center">{{row.f_outlets}}</td>
-              <td style="text-align:center">{{row.note}}</td>
-            </tr>
-          </template>
-          <template partial='foot'></template>
-        </data-grid>
-      </criteria-paged>
-      <table class="table-hover">
-        <tr  class="table-bordered">
-          <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">换表后气量合计:&emsp;{{sumsmodel.gas1}}</td>
-          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">换表后金额合计:&emsp;{{sumsmodel.fee}}</td>
-        </tr>
-      </table>
-  </div>
-</template>
-
-<script>
-  import {PagedList} from 'vue-client'
-
-  export default {
-    title: '流水查询',
-    data () {
-      return {
-        condition: '1=1',
-        f_filiale: this.$appdata.getParam('售气单位') ? [{label: '全部', value: ''},...this.$appdata.getParam('售气单位')] : [],
-        model: new PagedList('rs/sql/sale_RecordQuery', 20,
-          null,{gas1: 0,fee:0}),
-        row: null,
-        isdeal: true,
-        show: false,
-        sumsmodel: {}
-      }
-    },
-    props:
-      {
-        searchdata: {},
-        isdeal: {},
-        args:{}
-      },
-    ready () {
-      this.$refs.paged.$refs.criteria.search()
-    },
-    computed:{
-      selldep () {
-        let rs = []
-        if(this.$refs.paged.$refs.criteria.model.f_filiale){
-          this.$refs.paged.$refs.criteria.model.f_outlets = ''
-          return [{label: '全部', value: ''}, ...this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_filiale) ]
-        }
-        else {
-          return [{label: '全部', value: ''}]
-        }
-      },
-    },
-    methods: {
-      search(args){
-      if(this.args && this.args.model) {
-        if(this.searchdata.f_user_id) {
-          this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.searchdata.f_user_id}'`
-        } else if(this.searchdata.f_card_id){
-          this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_card_id = '${this.searchdata.f_card_id}'`
-        }else if(this.searchdata.f_userinfo_id) {
-          this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_userinfo_id = '${this.searchdata.f_userinfo_id}'`
-        }else {
-          return
-        }
-        this.model.search(this.condition, this.args.model)
-        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
-      }
-    }
-  },
-    watch:{
-      args(val){
-        this.search()
-      }
-    }
-  }
-</script>
-
+<template >
+  <div id="stand-work-list" class="flex bg-white p-10">
+      <criteria-paged :model="model" v-ref:paged  >
+        <criteria partial='criteria' v-ref:criteria  @condition-changed='$parent.search'>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row" width="100%">
+              <div class="col-sm-4" >
+                <label class="font_normal_body" style="width: 40%;">&nbsp;开始时间</label>
+                <datepicker placeholder="起始时间" style="width:60%"
+                            :value.sync="model.f_start_date"
+                            v-model="model.f_start_date"
+                            :format="'yyyy-MM-dd'"
+                            condition="f_operate_date >= to_date('{} 00:00:00','yyyy-mm-dd hh24:mi:ss')"
+                ></datepicker>
+              </div>
+              <div class="col-sm-4"  >
+                <label class="font_normal_body"  style="width: 40%;">结束时间</label>
+                <datepicker placeholder="结束时间" style="width:60%"
+                            :value.sync="model.f_end_date"
+                            v-model="model.f_end_date"
+                            :format="'yyyy-MM-dd'"
+                            condition="f_operate_date <= to_date('{} 23:59:59','yyyy-mm-dd hh24:mi:ss')"
+                ></datepicker>
+              </div>
+              <div class=" col-sm-4">
+                <label class="font_normal_body " style="width: 40%;" >售气公司</label>
+                <v-select :value.sync="model.f_filiale"
+                          v-model="model.f_filiale"
+                          style="width:60%"
+                          :options='$parent.$parent.f_filiale' placeholder='请选择'
+                          condition="f_filiale = '{}'"
+                          close-on-select></v-select>
+                <!--<input-->
+                <!--type="text"-->
+                <!--class="form-control" style="width: 60%"-->
+                <!--v-model="model.f_filiale"-->
+                <!--condition="f_filiale like '%{}%'"-->
+                <!--placeholder="售气公司"-->
+                <!--/>-->
+              </div>
+              <div class="col-sm-4">
+                <label class="font_normal_body "  style="width: 40%;">售气部门</label>
+                <v-select :value.sync="model.f_outlets"
+                          v-model="model.f_outlets"
+                          style="width:60%"
+                          :options='$parent.$parent.selldep' placeholder='请选择'
+                          condition="f_outlets = '{}'"
+                          close-on-select></v-select>
+                <!--<input-->
+                <!--type="text"-->
+                <!--class="form-control" style="width: 60%"-->
+                <!--v-model="model.f_outlets"-->
+                <!--condition="f_outlets like '%{}%'"-->
+                <!--placeholder="售气部门"-->
+                <!--/>-->
+              </div>
+              <div class="span" style="float:right;">
+                <button class="btn btn-success"  @click="search()" v-el:cba>查询</button>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <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>
+            </tr>
+          </template>
+          <template partial='body' partial='list' v-ref:grid>
+            <tr >
+              <td style="text-align:center">{{row.f_operat_type}}</td>
+              <td style="text-align:center">{{row.type}}</td>
+              <td style="text-align:center">{{row.gas}}</td>
+              <td style="text-align:center">{{row.fee}}</td>
+              <td style="text-align:center">{{row.f_operator}}</td>
+              <td style="text-align:center">{{row.op_spot}}</td>
+              <td style="text-align:center">{{row.f_operate_date}}</td>
+              <td style="text-align:center">{{row.f_filiale}}</td>
+              <td style="text-align:center">{{row.f_outlets}}</td>
+              <td style="text-align:center">{{row.note}}</td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+      <table class="table-hover">
+        <tr  class="table-bordered">
+          <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">换表后气量合计:&emsp;{{sumsmodel.gas1}}</td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">换表后金额合计:&emsp;{{sumsmodel.fee}}</td>
+        </tr>
+      </table>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+
+  export default {
+    title: '流水查询',
+    data () {
+      return {
+        condition: '1=1',
+        f_filiale: this.$appdata.getParam('售气单位') ? [{label: '全部', value: ''},...this.$appdata.getParam('售气单位')] : [],
+        model: new PagedList('rs/sql/sale_RecordQuery', 20,
+          null,{gas1: 0,fee:0}),
+        row: null,
+        isdeal: true,
+        show: false,
+        sumsmodel: {}
+      }
+    },
+    props:
+      {
+        searchdata: {},
+        isdeal: {},
+        args:{}
+      },
+    ready () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    computed:{
+      selldep () {
+        let rs = []
+        if(this.$refs.paged.$refs.criteria.model.f_filiale){
+          this.$refs.paged.$refs.criteria.model.f_outlets = ''
+          return [{label: '全部', value: ''}, ...this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_filiale) ]
+        }
+        else {
+          return [{label: '全部', value: ''}]
+        }
+      },
+    },
+    methods: {
+      search(args){
+      if(this.args && this.args.model) {
+        if(this.searchdata.f_user_id) {
+          this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.searchdata.f_user_id}'`
+        } else if(this.searchdata.f_card_id){
+          this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_card_id = '${this.searchdata.f_card_id}'`
+        }else if(this.searchdata.f_userinfo_id) {
+          this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_userinfo_id = '${this.searchdata.f_userinfo_id}'`
+        }else {
+          return
+        }
+        this.model.search(this.condition, this.args.model)
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+      }
+    }
+  },
+    watch:{
+      args(val){
+        this.search()
+      }
+    }
+  }
+</script>
+