address-client 3.2.41 → 3.2.43-1

package/build/versionCheck.js

@@ -0,0 +1,31 @@
+function isVersionGreaterThan (version1, version2) {
+  const v1parts = version1.split('.')
+  const v2parts = version2.split('.')
+  let flag = false
+  for (let i = 0; i < v1parts.length; ++i) {
+    if (v1parts[i] > v2parts[i]) {
+      flag = true
+      break
+    }
+  }
+
+  return flag
+}
+
+const pkg = require('../package.json')
+const checkVersion = () => {
+  console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请注意：当前使用的 addressclient 版本, 会发送 api/af-revenue/sql ,api/af-revenue/logic 到v4 服务')
+  const {devDependencies} = pkg
+  if (devDependencies && devDependencies['system-clients']) {
+    if (isVersionGreaterThan(devDependencies['system-clients'], '3.2.87')) {
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请注意：当前使用的 systemClients 版本不兼容旧版登录')
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '登录是会发送 api/af-auth 请求')
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请转发到公司 v4 测试地址或者客户 v4 网关')
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '如不使用新版登录，请降级 system-clients 版本到 3.2.87')
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请查看营收后台升级日志：' +
+        'http://aote-office.8866.org:31467/sale-doc-web/V4Product/%E8%90%A5%E6%94%B6%E5%90%8E%E5%8F%B0%E6%94%B9%E9%80%A0%E8%AF%B4%E6%98%8E')
+    }
+  }
+}
+
+module.exports = checkVersion

package/package.json

@@ -1,99 +1,99 @@
-{
-  "name": "address-client",
-  "version": "3.2.41",
-  "description": "地址管理前台组件",
-  "author": "wanbochao",
-  "license": "ISC",
-  "main": "src/index.js",
-  "keywords": [
-    "sale"
-  ],
-  "scripts": {
-    "unit": "karma start test/unit/karma.conf.js",
-    "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",
-    "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
-    "release": "bash build/release.sh"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aote/address_management.git"
-  },
-  "dependencies": {
-    "less-loader": "^2.2.3",
-    "vue": "^1.0.17"
-  },
-  "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-client": "3.2.11-17",
-    "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.1.88-5",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.24.27",
-    "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",
-    "jsencrypt": "3.0.0-rc.1",
-    "axios": "0.15.3"
-  }
-}
+{
+  "name": "address-client",
+  "version": "3.2.43-1",
+  "description": "地址管理前台组件",
+  "author": "wanbochao",
+  "license": "ISC",
+  "main": "src/index.js",
+  "keywords": [
+    "sale"
+  ],
+  "scripts": {
+    "unit": "karma start test/unit/karma.conf.js",
+    "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",
+    "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
+    "release": "bash build/release.sh"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aote/address_management.git"
+  },
+  "dependencies": {
+    "less-loader": "^2.2.3",
+    "vue": "^1.0.17"
+  },
+  "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-client": "3.2.11-17",
+    "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.1.88-5",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.24.27",
+    "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",
+    "jsencrypt": "3.0.0-rc.1",
+    "axios": "0.15.3"
+  }
+}

package/src/components/AddressList.vue

@@ -15,7 +15,7 @@
               </res-select>
             </div>
             <div :class="$parent.$parent.style" v-if="$parent.$parent.showrightchange">
-              <label class="font_normal_body">用户编号</label>
+              <label class="font_normal_body">客户编号</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" style="width:60%"
                       condition="f_userinfo_code = '{}'" placeholder="用户编号"/>
             </div>
@@ -101,7 +101,7 @@
               />
             </div>
             <div :class="$parent.$parent.style" >
-              <label class="font_normal_body">详细地址</label>
+              <label class="font_normal_body">客户地址</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_address" style="width:60%"
                       condition="a.f_address like '%{}%'" placeholder="详细地址"
                       :size="model.f_address ? model.f_address.length*2 : 8"/>
@@ -138,7 +138,7 @@
       <data-grid  :model="model" partial='list' style="overflow: auto" class="list_area table_sy" :optional="true" v-ref:grid>
         <template partial='head'>
           <th><nobr>序号</nobr></th>
-          <th><nobr>用户编号</nobr></th>
+          <th><nobr>客户编号</nobr></th>
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>区/县</nobr></th>
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>片区/管理站</nobr></th>
           <th><nobr>街道/乡镇</nobr></th>
@@ -147,7 +147,7 @@
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>单元</nobr></th>
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>楼层</nobr></th>
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>门牌号</nobr></th>
-          <th><nobr>详细地址</nobr></th>
+          <th><nobr>客户地址</nobr></th>
           <th><nobr>地址状态</nobr></th>
           <th><nobr>状态</nobr></th>
           <th><nobr>时间</nobr></th>

package/src/components/AreaList.vue

@@ -114,7 +114,7 @@
             <th><nobr>街道/乡镇</nobr></th>
             <!--民用小区信息开始-->
             <th v-if="!$parent.$parent.$parent.f_special"><nobr>小区名称</nobr></th>
-            <th v-if="!$parent.$parent.$parent.f_special"><nobr>详细地址</nobr></th>
+            <th v-if="!$parent.$parent.$parent.f_special"><nobr>地址</nobr></th>
             <th v-if="!$parent.$parent.$parent.f_special && !$parent.$parent.$parent.$parent.areaShow"><nobr>小区备注</nobr></th>
             <!--民用小区信息结束-->
             <!--非民用单位信息开始-->

package/src/components/StreetList.vue

@@ -75,7 +75,7 @@
                             :order.sync="$parent.$parent.$parent.$parent.orderFields.f_iscity"></data-order></th>
             <th><nobr>街道/乡镇</nobr></th>
             <th><nobr>街道编号</nobr></th>
-            <th><data-order field="f_address" name="详细地址"
+            <th><data-order field="f_address" name="地址"
                             :order.sync="$parent.$parent.$parent.$parent.orderFields.f_address"></data-order></th>
             <th><nobr>分公司</nobr></th>
             <th title="该街道下现有的小区数"><nobr>小区数量</nobr></th>

package/src/components/UserAddress.vue

@@ -134,7 +134,7 @@
             <label class="font_normal_body">经&ensp;纬&ensp;度</label>
             <input type="text" style="width:30%" v-model="model.f_lng" class="input_search" placeholder="经度"/>
             <input type="text" style="width:30%" v-model="model.f_lat" class="input_search" placeholder="纬度"/>
-            &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>
+<!--            &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>-->
           </div>
 
           <div v-if="usertype" class="col-sm-12 form-group "
@@ -147,7 +147,7 @@
             <label class="font_normal_body">经&ensp;纬&ensp;度</label>
             <input type="text" style="width:30%" v-model="model.f_lng" class="input_search" placeholder="经度"/>
             <input type="text" style="width:30%" v-model="model.f_lat" class="input_search" placeholder="纬度"/>
-            &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>
+<!--            &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>-->
           </div>
           <div class="col-sm-6 form-group " v-if="config.hasnumber"
                :class="[$v.f_standard_number.required ? 'has-error' : 'has-success']">
@@ -317,17 +317,17 @@
       </div>
     </validator>
 
-    <modal :show.sync="isshow"  large backdrop="false" :width="900">
-      <header slot="modal-header" class="modal-header">
-      </header>
-      <article slot="modal-body" class="modal-body">
-        <amap-location :islocationclearmark="false"  dom="addboxmap" v-ref:positionInfo @getmylocation="getmylocation"></amap-location>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button v-show="isshow" type="button" class="button_search button_spacing" @click='confirmLocation'>确认</button>
-        <button v-show="isshow" type="button" class="button_clear button_spacing" @click='closeModal'>取消</button>
-      </footer>
-    </modal>
+<!--    <modal v-if="isshow" :show.sync="isshow"  large backdrop="false" :width="900">-->
+<!--      <header slot="modal-header" class="modal-header">-->
+<!--      </header>-->
+<!--      <article slot="modal-body" class="modal-body">-->
+<!--        <amap-location :islocationclearmark="false"  dom="addboxmap" v-ref:positionInfo @getmylocation="getmylocation"></amap-location>-->
+<!--      </article>-->
+<!--      <footer slot="modal-footer" class="modal-footer">-->
+<!--        <button v-show="isshow" type="button" class="button_search button_spacing" @click='confirmLocation'>确认</button>-->
+<!--        <button v-show="isshow" type="button" class="button_clear button_spacing" @click='closeModal'>取消</button>-->
+<!--      </footer>-->
+<!--    </modal>-->
 
   </div>
 </template>

package/src/filiale/WEINAN/AddAreaMsg.vue

@@ -56,6 +56,17 @@
                    class="form-control" placeholder="小区名称"
                    v-validate:f_residential_area='{required: true }'>
           </div>
+          <div class="col-sm-6 form-group"
+               :class="[$v.f_street_id.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">安检片区</label>
+            <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_check_book_id"
+                   v-validate:f_street_id='{required: true }'>
+            <v-select
+              :value.sync="areamodel.f_check_book_id" :value-single="true"
+              :options='safeCheckArea' placeholder='请选择'
+              close-on-select search="true">
+            </v-select>
+          </div>
           <div v-if="!f_special"
                class="col-sm-12 form-group">
             <label class="font_normal_body">小区地址</label>
@@ -289,7 +300,7 @@
         meterbrands: [],
         adjustables: [],
         sliceArea: [],
-
+        safeCheckArea: [],
         gasproperties: [],
         meterbooks:[{label: '全部',value: ''}],
         housetypeoptions:[{label: '楼房', value: '楼房'}, {label: '自建房', value: '自建房'}],
@@ -335,6 +346,7 @@
       async initParams() {
         await this.$LoadParams.loadParam(this.f_filialeids)
         this.initBrands()
+        this.initSafeCheckArea()
        // this.initAdjustables()
       },
 
@@ -346,6 +358,19 @@
         })
         this.meterbrands = rs
       },
+      async initSafeCheckArea () {
+        this.safeCheckArea = []
+        let data = {
+          items: 'id,f_check_book_name',
+          tablename: 't_check_book',
+          orderitem: 'id',
+          condition: `f_orgid=${this.$login.f.orgid}`
+        }
+        let ret = await this.$resetpost('rs/sql/address_singleTableOrderBy',{data: data},{resolveMsg: null, rejectMsg: null})
+        ret.data.forEach(item => {
+          this.safeCheckArea.push({label: item.f_check_book_name, value: item.id})
+        })
+      },
 /*
       initAdjustables () {
         let filter = this.$login.f.orgid

package/src/filiale/WEINAN/AreaManage.vue

@@ -0,0 +1,109 @@
+<template>
+  <div id="unit" class="flex-row" :class="{'binary':areaShow == 0}">
+    <div :class="{'basic-main':areaShow == 0,'binary-left':areaShow != 0}">
+      <area-list @child-dblclick="selected" v-ref:arealist :style="style" :f_filialeids.sync="f_filialeids"></area-list>
+    </div>
+    <div v-show="areaShow == 1" style="width: 60%" class="binary-right">
+      <div class="flex">
+        <add-area-msg v-ref:addareamsg :areatype="areatype" :operation="operation"
+                      :f_filialeids.sync="f_filialeids" :row="arearow"></add-area-msg>
+      </div>
+    </div>
+    <div v-show="areaShow == 2" style="width: 60%" class="binary-right">
+      <div class="flex">
+        <area-user-list v-if="areaid" :areaid="areaid"></area-user-list>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '小区管理',
+  components: {},
+  data () {
+    return {
+      // 分公司id串
+      width: '100%',
+      f_filialeids: this.$login.f.f_orgids,
+      areaShow: 0,
+      areatype: '小区',
+      arearow: {},
+      style: 'col-sm-2 form-group',
+      areaid: null
+    }
+  },
+  ready () {
+
+  },
+  props: {},
+  methods: {
+    selected (obj) {
+      console.log('======', obj)
+      this.style = 'col-sm-3 form-group'
+      if (obj && obj.id) {
+        console.log('对比分公司', obj.f_filialeid, this.f_filialeids)
+        if (obj.f_filialeid != this.f_filialeids) {
+          this.refresh()
+          return
+        }
+        this.areaShow = 1
+        this.$refs.addareamsg.cleardara()
+        this.$refs.addareamsg.operation = 'modify'
+        this.$refs.addareamsg.areatype = '小区'
+        this.$refs.addareamsg.areamodel = Object.assign({}, obj)
+        if (obj.f_slice_area) {
+          this.$refs.addareamsg.areamodel.slice_area = [{
+            name: this.$refs.addareamsg.areamodel.f_slice_area,
+            code: this.$refs.addareamsg.areamodel.f_area_code
+          }]
+        }
+        if (obj.f_meter_book != null && obj.f_meter_book != '' && obj.f_meter_book instanceof Array) {
+          this.$refs.addareamsg.areamodel.f_meter_book = parseInt(obj.f_meter_book[0])
+        }
+        if (obj.f_meter_book != null && obj.f_meter_book != '' && !(obj.f_meter_book instanceof Array)) {
+          this.$refs.addareamsg.areamodel.f_meter_book = parseInt(obj.f_meter_book)
+        }
+        if (obj.f_adjustable_id != null && obj.f_adjustable_id != '' && obj.f_adjustable_id instanceof Array) {
+          this.$refs.addareamsg.areamodel.f_adjustable_id = parseInt(obj.f_adjustable_id[0])
+        }
+        if (obj.f_adjustable_id != null && obj.f_adjustable_id != '' && !(obj.f_adjustable_id instanceof Array)) {
+          this.$refs.addareamsg.areamodel.f_adjustable_id = parseInt(obj.f_adjustable_id)
+        }
+        // this.$refs.addareamsg.initdata(obj)
+        // this.$refs.addareamsg.initrow(obj)
+      }
+    },
+    refresh () {
+      this.areaShow = false
+      this.$refs.arealist.$refs.paged.$refs.cri.search()
+    }
+  },
+  events: {
+    'shouAreaAllUser' (row) {
+      this.style = 'col-sm-3 form-group'
+      this.areaShow = 2
+      this.areaid = row.id
+    },
+    'add'(val) {
+      this.style = 'col-sm-3 form-group'
+      this.areaShow = 1
+      this.$refs.addareamsg.cleardara()
+      this.$refs.addareamsg.operation = 'add'
+      this.$refs.addareamsg.areatype = val
+      this.$refs.addareamsg.initdata()
+    },
+    'confirm'() {
+      this.style = 'col-sm-2 form-group'
+      this.areaShow = false
+      this.$refs.arealist.$refs.paged.$refs.cri.search()
+    },
+    'cancel'() {
+      this.style = 'col-sm-2 form-group'
+      this.$refs.arealist.$refs.paged.$refs.cri.search()
+      this.areaShow = 0
+    }
+  }
+}
+</script>
+