sale-client 3.6.256 → 3.6.258

package/package.json

@@ -1,120 +1,120 @@
-{
-  "name": "sale-client",
-  "version": "3.6.256",
-  "description": "收费模块前台组件",
-  "main": "src/index.js",
-  "scripts": {
-    "example": "node build/example-server.js",
-    "dev": "webpack-dev-server --config ./build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "unit": "karma start test/unit/karma.conf.js",
-    "build": "rimraf lib && mkdirp lib && cross-env 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/product.git"
-  },
-  "dependencies": {
-    "crypto-js": "^4.1.1",
-    "examples": "^0.1.0",
-    "js-file-download": "0.4.12",
-    "less-loader": "^2.2.3",
-    "qrcodejs2": "0.0.2",
-    "vue": "^1.0.17",
-    "webpack-dev-server": "^2.11.5",
-    "vue-client": "1.24.137",
-    "yarn": "^1.22.10"
-  },
-  "devDependencies": {
-    "address-client": "3.2.56",
-    "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",
-    "compression-webpack-plugin": "1.1.2",
-    "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": "^3.19.0",
-    "eslint-config-standard": "^10.2.1",
-    "eslint-friendly-formatter": "^3.0.0",
-    "eslint-loader": "^1.7.1",
-    "eslint-plugin-html": "^3.0.0",
-    "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-node": "^5.2.0",
-    "eslint-plugin-promise": "^3.4.0",
-    "eslint-plugin-standard": "^3.0.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^3.0.2",
-    "terser-webpack-plugin-legacy": "^1.2.5",
-    "file-loader": "^0.8.4",
-    "filemanager-webpack-plugin": "^2.0.5",
-    "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.62",
-    "less": "^2.7.3",
-    "manage-client": "3.1.8-88",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "moment": "2.24.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "qrcodejs2": "0.0.2",
-    "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",
-    "system-clients": "3.2.61",
-    "url-loader": "^0.5.7",
-    "vue-clipboard2": "0.3.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": "^3.12.0",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3",
-    "webpack-parallel-uglify-plugin": "^1.0.0",
-    "weixin-js-sdk": "^1.2.0"
-  },
-  "keywords": [
-    "selling-clients"
-  ],
-  "author": "张桥",
-  "license": "ISC",
-  "directories": {
-    "example": "examples",
-    "test": "test"
-  }
-}
+{
+  "name": "sale-client",
+  "version": "3.6.258",
+  "description": "收费模块前台组件",
+  "main": "src/index.js",
+  "scripts": {
+    "example": "node build/example-server.js",
+    "dev": "webpack-dev-server --config ./build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "unit": "karma start test/unit/karma.conf.js",
+    "build": "rimraf lib && mkdirp lib && cross-env 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/product.git"
+  },
+  "dependencies": {
+    "crypto-js": "^4.1.1",
+    "examples": "^0.1.0",
+    "js-file-download": "0.4.12",
+    "less-loader": "^2.2.3",
+    "qrcodejs2": "0.0.2",
+    "vue": "^1.0.17",
+    "webpack-dev-server": "^2.11.5",
+    "vue-client": "1.24.137",
+    "yarn": "^1.22.10"
+  },
+  "devDependencies": {
+    "address-client": "3.2.56",
+    "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",
+    "compression-webpack-plugin": "1.1.2",
+    "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": "^3.19.0",
+    "eslint-config-standard": "^10.2.1",
+    "eslint-friendly-formatter": "^3.0.0",
+    "eslint-loader": "^1.7.1",
+    "eslint-plugin-html": "^3.0.0",
+    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-node": "^5.2.0",
+    "eslint-plugin-promise": "^3.4.0",
+    "eslint-plugin-standard": "^3.0.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^3.0.2",
+    "terser-webpack-plugin-legacy": "^1.2.5",
+    "file-loader": "^0.8.4",
+    "filemanager-webpack-plugin": "^2.0.5",
+    "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.62",
+    "less": "^2.7.3",
+    "manage-client": "3.1.8-88",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "moment": "2.24.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "qrcodejs2": "0.0.2",
+    "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",
+    "system-clients": "3.2.61",
+    "url-loader": "^0.5.7",
+    "vue-clipboard2": "0.3.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": "^3.12.0",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3",
+    "webpack-parallel-uglify-plugin": "^1.0.0",
+    "weixin-js-sdk": "^1.2.0"
+  },
+  "keywords": [
+    "selling-clients"
+  ],
+  "author": "张桥",
+  "license": "ISC",
+  "directories": {
+    "example": "examples",
+    "test": "test"
+  }
+}

package/src/components/FilesManage/AddHostMeterUserList.vue

@@ -0,0 +1,185 @@
+<template>
+  <div class="auto">
+    <modal :show.sync="show" v-ref:modal large backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeModal()"><span>&times;</span></button>
+        <h4 class="modal-title">选择用户档案</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div style="height: 600px">
+          <criteria-paged :model="model" v-ref:paged>
+            <criteria partial='criteria' @condition-changed='$parent.$parent.selfSearch' v-ref:cri>
+              <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+                <div class="row">
+                  <div class="col-sm-4 form-group">
+                    <label class="font_normal_body">客户编号</label>
+                    <input type="text"
+                           class="input_search"
+                           style="width:60%"
+                           v-model="model.f_userinfo_code"
+                           condition="f_userinfo_code = '{}'"
+                           placeholder="客户编号"/>
+                  </div>
+                  <div class="col-sm-4 form-group">
+                    <label class="font_normal_body">客户名称</label>
+                    <input type="text"
+                           class="input_search"
+                           style="width:60%"
+                           v-model="model.f_user_name"
+                           condition="f_user_name like '%{}%'"
+                           placeholder="客户名称"/>
+                  </div>
+
+                  <div class="col-sm-4 form-group button-range">
+                    <button class="button_search button_spacing" @click="search()">查询</button>
+                    <div
+                      :class="{'button_shrink_top':$parent.$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.$parent.criteriaShow}"
+                      @click="$parent.$parent.$parent.hidden()"
+                      class="button_spacing"
+                      style="float: right">
+                    </div>
+                  </div>
+                </div>
+                <div class="row" v-if="$parent.$parent.$parent.criteriaShow">
+                  <div class="col-sm-4 form-group">
+                    <label class="font_normal_body">详细地址</label>
+                    <input class="input_search"
+                           condition="f_address like '%{}%'"
+                           placeholder='详细地址'
+                           style="width:60%"
+                           type="text"
+                           v-model="model.f_address">
+                  </div>
+                  <div class="col-sm-4 form-group">
+                    <label class="font_normal_body">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
+                    <input class="input_search"
+                           condition="f_meternumber ='{}'"
+                           placeholder='表号'
+                           style="width:60%"
+                           type="text"
+                           v-model="model.f_meternumber" />
+                  </div>
+                </div>
+              </div>
+            </criteria>
+            <data-grid :model="model" partial='list' style="overflow: auto"
+                       class="list_area table_sy" v-ref:grid>
+              <template partial='head'>
+                <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>
+              </template>
+              <template partial='body'>
+                <td style="text-align:center">
+                  <nobr>{{ row.f_userinfo_code }}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{ row.f_user_name }}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{ row.f_meternumber }}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{ row.f_address }}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{ row.f_meter_brand }}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{ row.f_meter_style }}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <button type="button" name="button" class="button_search-2 button_spacing width-60"
+                          @click.stop="$parent.$parent.$parent.$parent.confirm(row)">确认
+                  </button>
+                </td>
+              </template>
+              <template partial='foot'></template>
+            </data-grid>
+          </criteria-paged>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+
+export default {
+  data () {
+    return {
+      criteriaShow: false,
+      batchRowList: [],
+      selectRowLen: 0,
+      f_reason: '',
+      operateTitle: '',
+      selectRow: null,
+      operateShow: false,
+      showOptional: false,
+      batchUpdateAreaShow: false,
+      model: new PagedList('rs/sql/sale_getUnboundHostMeter', 20)
+    }
+  },
+  title: '添加总表用户档案列表',
+  props: ['show', 'f_filialeids'],
+  ready () {
+    this.search()
+  },
+  methods: {
+    confirm (row) {
+      console.log('选中总表档案了', row)
+      this.$dispatch('selectUser', row)
+    },
+    closeModal () {
+      this.show = false
+    },
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    },
+    cancel () {
+      this.$dispatch('cancel')
+    },
+    search () {
+      this.$refs.paged.$refs.cri.search()
+    },
+    selfSearch (args) {
+      if (this.f_filialeids) {
+        args.condition = `${args.condition} and f_orgid = '${this.f_filialeids}'`
+      } else {
+        args.condition = `${args.condition} and f_orgid = '${this.$login.f.orgid}'`
+      }
+      this.model.search(args.condition, args.model)
+    }
+  },
+  events: {},
+  computed: {},
+  watch: {
+    'data' (val) {
+      if (val) {
+        this.search()
+      }
+    }
+  }
+}
+</script>

package/src/components/FilesManage/AddSubMeterUserList.vue

@@ -0,0 +1,185 @@
+<template>
+  <div class="auto">
+    <modal :show.sync="show" v-ref:modal large backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeModal()"><span>&times;</span></button>
+        <h4 class="modal-title">添加分表</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div style="height: 600px">
+          <criteria-paged :model="model" v-ref:paged>
+            <criteria partial='criteria' @condition-changed='$parent.$parent.selfSearch' v-ref:cri>
+              <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+                <div class="row">
+                  <div class="col-sm-4 form-group">
+                    <label class="font_normal_body">客户编号</label>
+                    <input type="text"
+                           class="input_search"
+                           style="width:60%"
+                           v-model="model.f_userinfo_code"
+                           condition="f_userinfo_code = '{}'"
+                           placeholder="客户编号"/>
+                  </div>
+                  <div class="col-sm-4 form-group">
+                    <label class="font_normal_body">客户名称</label>
+                    <input type="text"
+                           class="input_search"
+                           style="width:60%"
+                           v-model="model.f_user_name"
+                           condition="f_user_name like '%{}%'"
+                           placeholder="客户名称"/>
+                  </div>
+
+                  <div class="col-sm-4 form-group button-range">
+                    <button class="button_search button_spacing" @click="search()">查询</button>
+                    <div
+                      :class="{'button_shrink_top':$parent.$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.$parent.criteriaShow}"
+                      @click="$parent.$parent.$parent.hidden()"
+                      class="button_spacing"
+                      style="float: right">
+                    </div>
+                  </div>
+                </div>
+                <div class="row" v-if="$parent.$parent.$parent.criteriaShow">
+                  <div class="col-sm-4 form-group">
+                    <label class="font_normal_body">详细地址</label>
+                    <input class="input_search"
+                           condition="f_address like '%{}%'"
+                           placeholder='详细地址'
+                           style="width:60%"
+                           type="text"
+                           v-model="model.f_address">
+                  </div>
+                  <div class="col-sm-4 form-group">
+                    <label class="font_normal_body">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
+                    <input class="input_search"
+                           condition="f_meternumber ='{}'"
+                           placeholder='表号'
+                           style="width:60%"
+                           type="text"
+                           v-model="model.f_meternumber" />
+                  </div>
+                </div>
+              </div>
+            </criteria>
+            <data-grid :model="model" partial='list' :optional="true" style="overflow: auto"
+                       class="list_area table_sy" v-ref:grid>
+              <template partial='head'>
+                <th>
+                  <nobr>用户编号</nobr>
+                </th>
+                <th>
+                  <nobr>用户姓名</nobr>
+                </th>
+                <th>
+                  <nobr>表号</nobr>
+                </th>
+                <th>
+                  <nobr>详细地址</nobr>
+                </th>
+                <th>
+                  <nobr>气表品牌</nobr>
+                </th>
+                <th>
+                  <nobr>气表型号</nobr>
+                </th>
+              </template>
+              <template partial='body'>
+                <td style="text-align:center">
+                  <nobr>{{ row.f_userinfo_code }}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{ row.f_user_name }}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{ row.f_meternumber }}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{ row.f_address }}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{ row.f_meter_brand }}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{ row.f_meter_style }}</nobr>
+                </td>
+              </template>
+              <template partial='foot'></template>
+            </data-grid>
+          </criteria-paged>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-success"  @click='confirm()'>确认添加到总表</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+
+export default {
+  data () {
+    return {
+      criteriaShow: false,
+      batchRowList: [],
+      selectRowLen: 0,
+      f_reason: '',
+      operateTitle: '',
+      selectRow: null,
+      operateShow: false,
+      showOptional: false,
+      batchUpdateAreaShow: false,
+      model: new PagedList('rs/sql/sale_getHostMeterAllUser', 20)
+    }
+  },
+  title: '添加总表用户档案列表',
+  props: ['show', 'f_filialeids'],
+  ready () {
+    this.search()
+  },
+  methods: {
+    confirm () {
+      if (this.$refs.paged.$refs.grid.getRowData().length > 0) {
+        this.batchRowList = this.$refs.paged.$refs.grid.getRowData()
+        this.$dispatch('batchMove', this.batchRowList)
+        this.$refs.paged.$refs.grid.selectInit()
+        this.show = false
+      } else {
+        this.$showAlert('请至少选择一项！', 'warning', 2000)
+      }
+    },
+    closeModal () {
+      this.show = false
+    },
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    },
+    cancel () {
+      this.$dispatch('cancel')
+    },
+    search () {
+      this.$refs.paged.$refs.cri.search()
+    },
+    selfSearch (args) {
+      if (this.f_filialeids) {
+        args.condition = `${args.condition} and f_orgid = '${this.f_filialeids}'`
+      } else {
+        args.condition = `${args.condition} and f_orgid = '${this.$login.f.orgid}'`
+      }
+      args.condition = `${args.condition} and (f_host_meter_id is null or f_host_meter_id = '')`
+      this.model.search(args.condition, args.model)
+    }
+  },
+  events: {},
+  computed: {},
+  watch: {
+    'data' (val) {
+      if (val) {
+        this.search()
+      }
+    }
+  }
+}
+</script>