sale-client 3.6.258 → 3.6.259

package/package.json

@@ -1,120 +1,120 @@
-{
-  "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"
-  }
-}
+{
+  "name": "sale-client",
+  "version": "3.6.259",
+  "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/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -84,6 +84,9 @@
         <saletab header="用户设备查询"  v-if="permission('用户设备查看')">
           <user-device-query :row="row" v-if="show == '用户设备查询'" @deal-msg="dealMsg"></user-device-query>
         </saletab>
+        <saletab header="合同查看"  v-if="permission('合同查看')">
+          <contract-signing-list :row="row" v-if="show == '合同查看'" @deal-msg="dealMsg"></contract-signing-list>
+        </saletab>
       </saletabbut>
     </div>
   </div>
@@ -108,6 +111,7 @@
   import WebChargeQueryUser from './ic_detail/WebChargeQueryUser'
   import WebHandQueryUser from './ic_detail/WebHandQueryUser'
   import UserDeviceQuery from './ic_detail/UserDeviceQuery'
+  import contractSigningList from './ic_detail/contractSigningList'
 
   // 导入物联网相关查询
   import QueryInstruct from './iot_detail/QueryInstruct'
@@ -115,10 +119,11 @@
   import WatchCollection from './iot_detail/WatchCollection'
   import WatchWarning from './iot_detail/WatchWarning'
   import PriceChangeQueryUser from './ic_detail/PriceChangeQueryUser'
-import ChangeRecord from './ic_detail/ChangeRecord'
+  import ChangeRecord from './ic_detail/ChangeRecord'
   import PriceAdjustmentQueryUser from './ic_detail/PriceAdjustmentQueryUser'
   import MeterParam from './ic_detail/MeterParam'
   import DeveiceRecord from './ic_detail/DeveiceRecord'
+
 export default {
     title: '用户详细信息',
     props: ['f_userfiles_id', 'f_userinfo_id', 'f_userinfo_code', 'parentname', 'buttonshow'],
@@ -147,7 +152,8 @@ export default {
       MeterParam,
       DeveiceRecord,
       MachineRecordQuery,
-      UserDeviceQuery
+      UserDeviceQuery,
+      contractSigningList
     },
     data () {
       return {

package/src/components/common/userinfo_detail/ic_detail/contractSigningList.vue

@@ -0,0 +1,117 @@
+<template >
+  <div class="flex" style="justify-content: space-between;">
+    <div @keyup.enter="search" style="">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
+          <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+            <div class="row">
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">开始时间</label>
+                <datepicker placeholder='开始时间' style="width:60%"
+                            v-model="model.startTime"
+                            :value.sync="model.startTime"
+                            :format="'yyyy-MM-dd'"
+                            :show-reset-button="true"
+                            condition="f_signature_date >= '{} 00:00:00'">
+                </datepicker>
+              </div>
+              <div class="col-sm-2 form-group" >
+                <label class="font_normal_body">结束日期</label>
+                <datepicker placeholder='结束日期' style="width:60%"
+                            v-model="model.endTime"
+                            :value.sync="model.endTime"
+                            :format="'yyyy-MM-dd'"
+                            :show-reset-button="true"
+                            condition="f_signature_date <= '{} 23:59:59'">
+                </datepicker>
+              </div>
+
+              <div style="float: right">
+                <button @click="search()"  class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
+              </div>
+            </div>
+
+
+          </div>
+
+        </criteria>
+        <data-grid :model="model" class="list_area table_sy" class="list_area table_sy" 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>操&emsp;&emsp;作</nobr></th>
+            </tr>
+          </template>
+          <template partial='body' partial='list' v-ref:grid>
+            <tr >
+              <td style="text-align:center">{{ row.f_userinfo_code }}</td>
+              <td style="text-align:center">{{ row.f_user_name }}</td>
+              <td style="text-align:center">{{ row.f_address }}</td>
+              <td style="text-align:center">{{ row.f_contract_name }}</td>
+              <td style="text-align:center">{{ row.f_signature_state }}</td>
+              <td style="text-align:center">{{ row.f_signature_date }}</td>
+              <td style="text-align:center">{{ row.f_user_name_not }}</td>
+              <td style="text-align:center"><button type="button" name="button" class="btn btn-link" @click="$parent.$parent.$parent.showExplain(row)">合同预览</button></td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+    <modal v-if="explainShow" :show.sync="explainShow" :title="titleL" style="height: 1000px" :width="1000" v-ref:model backdrop="false">
+      <article slot="modal-body" class="modal-body">
+        <iframe id="myIframe" :src="pdfPath" style="width: 100%;height: 500px"></iframe>
+      </article>
+      <div slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-default"  @click="printPDF">打印</button>
+        <button type="button" class="btn btn-default" @click="close()">关闭</button>
+      </div>
+    </modal>
+  </div>
+
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  export default {
+    title: '合同查看',
+    data () {
+      return {
+        condition: `f_userinfo_id = '${this.row.f_userinfo_id}'`,
+        model: new PagedList('rs/sql/getContractSigin', 20, {}),
+        explainShow: false,
+        pdfPath: null,
+        prPdf: null,
+        titleL: null
+      }
+    },
+    props: ['row'],
+    ready () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    methods: {
+      printPDF () {
+        window.open(this.prPdf, '_blank')
+      },
+      async search () {
+        this.condition = `f_userinfo_id = '${this.row.f_userinfo_id}'`
+        this.model.search(this.condition, this.model)
+      },
+      showExplain (row) {
+        this.pdfPath = row.f_visit_url + '#toolbar=0'
+        this.prPdf = row.f_visit_url
+        this.titleL = row.f_contract_name
+        this.explainShow = true
+      }
+    },
+    computed: {
+    }
+  }
+</script>
+

package/src/components/revenue/HandManager/meterbookEntry.vue

@@ -10,13 +10,12 @@
 </template>
 
 <script>
-  import MbpeopleList from './MbpeopleList'
   import AddTobook from './AddTobook'
   import {HttpResetClass} from 'vue-client'
 
   export default {
     name: 'meterbookEntry',
-    components: {AddTobook, MbpeopleList},
+    components: {AddTobook},
     title: '添加用户到抄表册',
     data () {
       return {

package/src/filiale/haile/FilesManage/MeterinfoTest.vue

@@ -11,7 +11,7 @@
             <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.brand.selectedItems"
                    v-validate:brand='{required: true }'>
             <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
-                      search @change='brandChange' v-model='row.gasbrand' :disabled="curuser.f_user_state != '预备'" v-ref:brand></v-select>
+                      search @change='brandChange' v-model='row.gasbrand' :disabled="curuser.f_user_state != '预备' && row.f_meter_classify != '机表'" v-ref:brand></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.model.required ? 'has-error' : '']">
             <label for="gasmodel" class="font_normal_body">气表型号</label>
@@ -19,7 +19,7 @@
                    v-validate:model='{required: true }'>
             <v-select :value.sync="row.gasmodel" :options='row.gasbrand[0].gasmodel' placeholder='气表型号'
                       close-on-select
-                      v-model='row.gasmodel' :disabled="row.gasbrand.length === 0 || curuser.f_user_state != '预备'" v-ref:model></v-select>
+                      v-model='row.gasmodel' :disabled="(row.gasbrand.length === 0 || curuser.f_user_state != '预备') && row.f_meter_classify != '机表'" v-ref:model></v-select>
           </div>
 
           <div class="col-sm-4 form-group" v-if="isiot" :class="[$m.f_meternumber.required ? 'has-error' : '']">

package/src/filiale/meihekou/MbpeopleList.vue

@@ -0,0 +1,563 @@
+<template>
+  <div id='MbpeopleList' class="flex">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="col-sm-3 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-3 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="form-group button-range" style="float: right">
+              <button class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>
+              <button class="button_clear button_spacing" @click="clear">清空</button>
+              <!--              <button class="button_export button_spacing" @click="$parent.$parent.importFile">导入</button>-->
+              <!--              <export-excel-->
+              <!--                :data="{condition:$parent.$parent.condition}"-->
+              <!--                :field="$parent.$parent.getfield"-->
+              <!--                sqlurl="rs/logic/exportfile" sql-name="salembPeopleList" template-name='表册用户导出'-->
+              <!--                :choose-col="true"></export-excel>-->
+              <div style="float: right" class="button_spacing"
+                   :class="{'button_shrink_top': $parent.$parent.criteriaShow,'button_shrink_bottom': !$parent.$parent.criteriaShow}"
+                   @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"></div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">&nbsp;小&nbsp;区&nbsp;域</label>
+              <v-select :value.sync="model.f_small_area" v-model="model.f_small_area"
+                        :options='$parent.$parent.smallareas' placeholder='小区域'
+                        close-on-select :search='true'
+                        condition="f_small_area = '{}'"></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">用户电话</label>
+              <input type="text" class="form-control" v-model="model.f_user_phone" placeholder='用户电话'
+                     condition="f_user_phone like '%{}%'" v-next-el='yhxm' style="width: 60%"
+              >
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">客户类型</label>
+              <v-select :options='$parent.$parent.user_type' :value.sync="model.f_user_type"
+                        close-on-select condition="f_user_type='{}'"
+                        placeholder='用户类型' v-model="model.f_user_type"></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">客户状态</label>
+              <v-select :options='$parent.$parent.user_state' :value.sync="model.f_user_state"
+                        close-on-select condition="f_user_state = '{}'"
+                        placeholder='客户状态' v-model="model.f_user_state"></v-select>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">所属表册</label>
+              <v-select :value.sync="model.f_meter_book_num" v-model="model.f_meter_book_num"
+                        :options='$parent.$parent.meterbooks' placeholder='抄表册'
+                        :value-single="true"
+                        condition="f_meter_book_num='{}'"
+                        style="width:60%"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">抄&nbsp;表&nbsp;员&nbsp;</label>
+              <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'
+                        style="width:60%"
+                        multiple="true"
+                        condition="f_inputtor in {}"
+                        :options='$parent.$parent.inputtores' placeholder='抄表员'
+                        close-on-select
+                        v-el:cc></v-select>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">表箱号&emsp;</label>
+              <!--              <input style="width:60%" type="text" class="form-control" v-model="model.f_adjustable_id"-->
+              <!--                     condition="f_adjustable_id like '%{}%'" placeholder='调压箱号'-->
+              <!--              >-->
+              <input style="width:60%" type="text" class="form-control" v-model="model.f_metertitles"
+                     condition="f_metertitles like '%{}%'" placeholder='表箱号'
+              >
+              <!--              <v-select :value.sync="model.f_adjustable_id" v-model="model.f_adjustable_id"-->
+              <!--                        :options='$parent.$parent.adjustables' placeholder='调压箱号'-->
+              <!--                        :value-single="true"-->
+              <!--                        condition="f_adjustable_id='{}'"-->
+              <!--                        style="width:60%"-->
+              <!--                        close-on-select></v-select>-->
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">用气性质</label>
+              <v-select :options='$parent.$parent.gasproperties' :value.sync="model.f_gasproperties"
+                        close-on-select condition="f_gasproperties='{}'"
+                        placeholder='用气性质' v-model="model.f_gasproperties"></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">气表类型</label>
+              <v-select :options='$parent.$parent.meter_classify' :value.sync="model.f_meter_classify"
+                        close-on-select condition="f_meter_classify='{}'"
+                        placeholder='气表类型' v-model="model.f_meter_classify"></v-select>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">气表品牌</label>
+              <v-select :value.sync="model.f_meter_brand" multiple
+                        v-model="model.f_meter_brand"
+                        :options='$parent.$parent.meterbrands' placeholder='请选择'
+                        condition="f_meter_brand in {}"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">小&emsp;区&emsp;</label>
+              <input type="text" class="input_search" v-model="model.f_residential_area" style="width: 60%"
+                     condition=" f_residential_area like '{}%'" placeholder="输入小区">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">客户地址</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_address"
+                     condition="f_address like '%{}%'" placeholder='客户地址'>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">楼&emsp;号&emsp;</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_building"
+                     condition="f_building = '{}'" placeholder='楼号'>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">组织机构</label>
+              <res-select :initresid='$parent.$parent.curorgid'
+                          @res-select="$parent.$parent.getorg"
+                          class="select select_list"
+                          restype='organization' :is-mul="false"
+                          style="width: 60%">
+              </res-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">是否在册</label>
+              <v-select :options='$parent.$parent.whether_list'
+                        :value.sync="model.f_book_name"
+                        v-model="model.f_book_name"
+                        close-on-select condition="f_book_name {}"
+                        placeholder='是否在册'></v-select>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">入户证号</label>
+              <input style="width:60%" type="text" class="form-control" v-model="model.f_book_no"
+                     condition="f_book_no like '%{}%'" placeholder='入户证号'
+              >
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">表&emsp;号&emsp;</label>
+              <input style="width:60%" type="text" class="form-control" v-model="model.f_meternumber"
+                     condition="f_meternumber like '%{}%'" placeholder='表号'
+              >
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid class="list_area table_sy" :model="model" partial='list' v-ref:grid :optional="true">
+        <template partial='head'>
+          <!--<th>-->
+          <!--<input type="checkbox" id="f_operator" v-model="$parent.$parent.$parent.all[model.pageIndex-1]"-->
+          <!--@change="$parent.$parent.$parent.select()"/>-->
+          <!--</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>
+        </template>
+        <template partial='body'>
+          <!--<td>-->
+          <!--<input :id="'body'+model.pageIndex" type='checkbox' @change="$parent.$parent.$parent.selectOne($event,row,$index)"-->
+          <!--:checked="$parent.$parent.$parent.ischecked(model.pageIndex-1,$index)"/>-->
+          <!--</td>-->
+          <td>
+            <nobr>{{ $index + 1 }}</nobr>
+          </td>
+          <td>
+            <nobr>{{ row.f_userinfo_code }}</nobr>
+          </td>
+          <td>
+            <nobr>{{ row.f_user_name }}</nobr>
+          </td>
+          <td>
+            <nobr>{{ row.f_user_state }}</nobr>
+          </td>
+          <td>
+            <nobr>{{ row.f_address }}</nobr>
+          </td>
+          <td>
+            <nobr>{{ row.f_meternumber }}</nobr>
+          </td>
+          <td>
+            <nobr>{{ row.f_book_name }}</nobr>
+          </td>
+          <td>
+            <nobr>{{ row.f_inputtor }}</nobr>
+          </td>
+<!--          <td>-->
+<!--            <nobr>{{ row.f_adjustable_id }}</nobr>-->
+<!--          </td>-->
+          <td>
+            <nobr>{{ row.f_hand_date }}</nobr>
+          </td>
+          <td>
+            <nobr>{{ row.f_user_type }}</nobr>
+          </td>
+          <td>
+            <nobr>{{ row.f_meter_base }}</nobr>
+          </td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+  <modal :show.sync="show" width="500px" title="文件导入" v-ref:modal large backdrop="false">
+    <article slot="modal-body" class="modal-body">
+      <file-upload class="my-file-uploader " name="UploadFile" style="border-radius: 2px;"
+                   action="rs/file/uploadFile" tagname="导入表册用户" v-ref:file multiple></file-upload>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+import Vue from 'vue'
+
+let loadParamGem = async function (self) {
+  await self.$LoadParams.loadParam()
+  self.getfield = self.config.excelHeaders
+  // self.$refs.paged.$refs.cri.model.f_meter_classify = ['机表']
+  self.$refs.paged.$refs.cri.model.f_book_name = ['is null']
+  await self.initAdjustables()
+  // await self.search()
+}
+export default {
+  name: 'MbpeopleList',
+  data() {
+    return {
+      orgCondtionStr: '',
+      f_filialeid: this.$login.f.orgid,
+      f_orgid: '',
+      invoiceuse: [{label: '是', value: 'is not null'}, {label: '否', value: 'is null'}],
+      model: new PagedList('rs/sql/mb_peopleList', 20),
+      f_orgstr: this.$login.f.orgid,
+      // 要操作的用户
+      rowsdata: [],
+      aaa: '',
+      // 控制全选
+      all: [],
+      // 控制单选
+      radio: [],
+      show: false,
+      meterbooks: [{label: '全部', value: ''}],
+      criteriaShow: false,
+      gasproperties: this.$appdata.getParam('用气性质') ? [{
+        label: '全部',
+        value: ''
+      }, ...this.$appdata.getParam('用气性质')] : [],
+      user_type: this.$appdata.getParam('用户类型') ? [{
+        label: '全部',
+        value: ''
+      }, ...this.$appdata.getParam('用户类型')] : [],
+      meter_classify: this.$appdata.getParam('气表类型') ? [{
+        label: '全部',
+        value: ''
+      }, ...this.$appdata.getParam('气表类型')] : [],
+      f_small_areas: this.$appdata.getParam('小区域') ? [{
+        label: '全部',
+        value: ''
+      }, ...this.$appdata.getParam('小区域')] : [],
+      user_state: [{label: '正常', value: '正常'}, {label: '预备', value: '预备'}, {label: '销户', value: '销户'}],
+      whether_list: [{label: '已在册内', value: 'is not null'}, {label: '不在册内', value: 'is null'}],
+      meterbrands: [],
+      condition: '',
+      adjustables: [],
+      unnullrowdata: [],
+      getfield: {},
+      config: {
+        // 导出列要和查询列相同
+        excelHeaders: {
+          'f_userfiles_id': '系统识别号',
+          'f_userinfo_code': '用户编号',
+          'f_user_name': '用户姓名',
+          'f_address': '用户地址'
+        }
+      },
+      curorgid: [this.$login.f.orgid]
+    }
+  },
+  created() {
+  },
+  ready() {
+    loadParamGem(this)
+  },
+  methods: {
+    async meterbook() {
+      this.meterbooks = []
+      if (this.f_orgid == '') {
+        this.f_orgid = this.$login.f.orgid
+      }
+      let res = await this.$resetpost('rs/sql/saleSingleTable', {
+        data: {
+          tablename: 't_meter_book',
+          condition: ` 1=1 and f_orgid='${this.f_orgid}' and f_book_state='有效'`
+        }
+      }, {resolveMsg: null, rejectMsg: null})
+      for (let i = 0; i < res.data.length; i++) {
+        console.log('res', res.data[i])
+        let temp = []
+        temp.label = res.data[i].f_book_name
+        temp.value = res.data[i].id
+        this.meterbooks.push(temp)
+      }
+    },
+    invoiceuseChange(val) {
+      // 查询已开票记录清空选项
+      if (val == 'is not null') {
+        this.rowsdata = []
+        this.radio = []
+      }
+    },
+
+    select() {
+      let index = this.model.pageIndex - 1
+      console.log('全选', this.all[index])
+      if (!this.radio[index]) {
+        this.radio.$set(index, [])
+      }
+      if (this.all[index]) {
+        // 数据
+        this.rowsdata[index] = Object.assign([], this.model.rows)
+        // 勾选
+        for (var i = 0; i < this.model.rows.length; i++) {
+          this.radio[index].$set(i, true)
+        }
+      } else {
+        // 数据
+        this.rowsdata[index] = []
+        // 不勾选
+        for (var i = 0; i < this.model.rows.length; i++) {
+          this.radio[index].$set(i, false)
+        }
+      }
+      this.mergeRowData()
+    },
+    importFile() {
+      this.show = true
+    },
+    async initAdjustables() {
+      let arr = []
+      let filter = this.$login.f.orgid
+      this.$GetSaleParam.getAdjustable(filter).forEach((item) => {
+        let temp = {}
+        temp.label = '[' + item.value.f_adjustable_id + ']-' + item.label
+        temp.value = item.value.id
+        arr.push(temp)
+      })
+      this.adjustables = [{label: '全部', value: ''}, ...arr]
+      // 初始化气表品牌
+      let brandArr = []
+      this.$GetSaleParam.getGasbrand().forEach((item) => {
+        let temp1 = {}
+        temp1.label = item.label
+        temp1.value = item.value.f_meter_brand
+        brandArr.push(temp1)
+      })
+      this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+      //
+      // // 加载抄表册
+      // console.log("------------------this.$GetSaleParam.getMeterBooks()",this.$GetSaleParam.getMeterBooks())
+      // this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
+    },
+    search() {
+      this.$refs.paged.$refs.cri.search()
+      console.log('mbpeople this = ', this)
+    },
+    selfSearch(args) {
+      let f_orgstr = this.orgCondtionStr ? this.orgCondtionStr : "and f_orgid in ('" + this.f_orgid + "')"
+      args.condition = `${args.condition} ` + f_orgstr
+      // args.condition += ` and f_orgid = ${this.f_orgstr}`
+      this.condition = args.condition
+      this.$parent.condition = this.condition
+      this.model.search(args.condition, args.model)
+    },
+    // 合并二维数组并去空
+    mergeRowData() {
+      console.log('!!!!!!!!!!!!!数组去空', this.rowsdata)
+      let data = []
+      // 合并
+      for (let array of this.rowsdata) {
+        data.push.apply(data, array)
+      }
+      // 去空
+      // 拓展数组去空值的方法
+      Array.prototype.removeEmpty = function () {
+        for (var i = 0; i < this.length; i++) {
+          if (this[i] == '' || typeof (this[i]) == 'undefined') {
+            this.splice(i, 1)
+            i--
+          }
+        }
+        return this
+      }
+      data = data.removeEmpty()
+      this.unnullrowdata = []
+      data.forEach((row) => {
+        this.unnullrowdata.push(row.f_userfiles_id + '')
+      })
+      this.$parent.rowsdata = this.unnullrowdata
+      // this.$parent.rowsdata = this.rowsdata
+    },
+    selectOne(event, row, i) {
+      console.log('单选', event.target.checked)
+      let index = this.model.pageIndex - 1
+      if (!this.rowsdata[index]) {
+        this.rowsdata[index] = []
+      }
+      if (!this.radio[index]) {
+        this.radio.$set(index, [])
+      }
+      if (event.target.checked) {
+        // 数据
+        this.rowsdata[index][i] = row
+        // 勾选
+        this.radio[index].$set(i, true)
+        // 判断是否全部选中
+        var allState = true
+        if (this.model.rows.length != this.radio[index].length) {
+          allState = false
+        }
+        for (var state of this.radio[index]) {
+          if (!state) {
+            allState = false
+          }
+        }
+        if (allState) {
+          this.all.$set(index, true)
+        } else {
+          this.all.$set(index, false)
+        }
+      } else {
+        // 数据
+        this.rowsdata[index][i] = []
+        // 不勾选
+        this.radio[index].$set(i, false)
+        // 任意取消一个则全选状态设为false
+        this.all.$set(index, false)
+      }
+      this.mergeRowData()
+    },
+    getorg(val) {
+      console.log('getorg:val=', val)
+      console.log('getorg:this.f_orgid=', this.f_orgid)
+      this.f_orgid = val
+      this.f_filialeid = val[0]
+    },
+    async getmeterbook() {
+      await this.meterbook()
+      this.$emit('childre', this.meterbooks)
+    }
+  },
+  computed: {
+    ischecked() {
+      return function (index, i) {
+        if (!this.radio[index]) {
+          return false
+        }
+        return this.radio[index][i]
+      }
+    },
+    smallareas() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('小区域')]
+    },
+    inputtores() {
+      // 获取抄表员
+      console.log('获取抄表员', this.$login.f)
+      let rs = []
+      if (this.$login.f.f_gasman.length > 0) {
+        for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+          let temp = {
+            label: this.$login.f.f_gasman[i].name,
+            value: this.$login.f.f_gasman[i].name
+          }
+          rs.push(temp)
+        }
+      }
+      this.inputtores2 = rs
+      return [...rs]
+    }
+  },
+  watch: {
+    async 'f_orgid'() {
+      this.meterbooks = []
+      await this.meterbook()
+      this.$emit('childre', this.meterbooks)
+    }
+  },
+  events: {
+    onFileUpload: function (file, res) {
+      // let URL = res.f_downloadpath.substring(res.f_downloadpath.lastIndexOf(":\\") + 2)
+      // res.f_downloadpath = "http://" + location.host + "/" + URL
+      // res.f_downloadpath.replace('\\','/')
+      this.$resetpost('rs/logic/upLoadBookFile',
+        {
+          data: {
+            condition: this.condition,
+            filepath: res.f_downloadpath
+          }
+        },
+        {resolveMsg: null, rejectMsg: '上传失败'}).then((res) => {
+        this.show = false
+        this.$showAlert(`导入成功`, 'success', 2000)
+        this.search()
+      })
+    }
+  }
+}
+</script>
+
+<style lang="less">
+#MbpeopleList {
+  tr {
+    th {
+      text-align: center;
+    }
+
+    td {
+      text-align: center;
+    }
+  }
+}
+</style>

package/src/filiale/meihekou/sale.js

@@ -43,4 +43,5 @@ export default function () {
   Vue.component('batch-edit-files', (resolve) => { require(['./batch/batchEditFiles'], resolve) })
   // 抄表审核
   Vue.component('meter-read-audit', (resolve) => { require(['./handAudit/MeterReadAudit'], resolve) })
+  Vue.component('mbpeople-list', (resolve) => { require(['./MbpeopleList'], resolve) })
 }

package/src/sale.js

@@ -381,6 +381,7 @@ export default function () {
   Vue.component('meterbook-user', (resolve) => { require(['./components/revenue/HandManager/MeterBookUser'], resolve) })
   // 抄表册新增用户管理
   Vue.component('meterbook-entry', (resolve) => { require(['./components/revenue/HandManager/meterbookEntry'], resolve) })
+  Vue.component('mbpeople-list', (resolve) => { require(['./components/revenue/HandManager/MbpeopleList'], resolve) })
   // 违约金生成规则（f_end_date规则）
   Vue.component('overdue-set', (resolve) => { require(['./components/revenue/HandManager/OverdueSet'], resolve) })
   Vue.component('overdue-set-list', (resolve) => { require(['./components/revenue/HandManager/OverdueSetList'], resolve) })