sale-client 3.5.6 → 3.5.7-dg

package/.babelrc

@@ -1,5 +1,5 @@
-{
-  "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-runtime"],
-  "comments": false
-}
+{
+  "presets": ["es2015", "stage-2"],
+  "plugins": ["transform-runtime"],
+  "comments": false
+}

package/build/dev-server.js

@@ -1,167 +1,161 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-var bendi = 'http://127.0.0.1:8080',bendi1 = 'http://121.36.106.17:8400/'
-// var bendi = 'http://192.168.50.4:8300/',bendi1 = 'http://121.36.106.17:8400/'
-// var bendi = 'http://192.168.50.4:8400/',bendi1 = 'http://121.36.106.17:8400/'
-// var bendi = 'http://139.214.92.34:8301/',bendi1 = 'http://121.36.106.17:8400/'
-// 公司测试服务
-// var fuwu = 'http://192.168.89.62:8400'
-// var fuwu = 'http://121.36.106.17:8400/'
-var fuwu = 'http://192.168.50.4:8400/'
-// var fuwu = 'http://192.168.50.4:8300/'
-// var fuwu = 'http://139.214.92.34:8301/'
-//铜川正式
-//  var fuwu = 'http://61.134.55.234:9999/'
-//铜川测试
-// var fuwu = 'http://61.134.55.234:9999/'
-// var fuwu = 'http://60.222.250.39:8300/'
-//韶关
-// var fuwu = 'http://119.146.1.106:8300/'
-// 巩义测试服务
-// var fuwu = 'http://192.168.0.227:8400'
-// 燎原测试服务
-// var fuwu = 'http://121.41.19.238:8400  '
-// var fuwu = 'http://121.41.19.238:9001/'
-
-// var fuwu = 'http://139.214.92.34:8301/'
-
-var proxyTable = {
-  '/rs/logic/saleExport': {
-    target: fuwu
-  },
-  '/rs/logic/saleGetExportProgress': {
-    target: fuwu
-  },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  '/rs/logic/getSaleInitData': {
-    target: fuwu
-  },
-  '/invoice':{
-    target: fuwu
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: fuwu
-  },
-  '/rs/path/getParams': {
-    target: fuwu
-  },
-  '/rs/data': {
-    target: fuwu
-  },
-  '/rs/license': {
-    target: fuwu
-  },
-  '/rs/db': {
-    target: fuwu
-  },
-  '/excel': {
-    target: fuwu
-  },
-  '/rs/config': {
-    target: fuwu
-  },
-  '/rs/sql/getLicenseById': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getarealist': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getstreetlist': {
-    target: fuwu
-  },
-  '/rs/report': {
-    target: 'http://121.36.106.17:8400/'
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/webmeter': {
-    target: 'http://192.168.50.4:8450'
-  },
-  '/rs': {
-    // target: 'http://192.168.30.63:8081/'
-    // target: 'http://121.36.106.17:8400/'
-    target: bendi
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-module.exports = app.listen(8089, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8089')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+var bendi = 'http://192.168.50.4:8400/', bendi1 = 'http://121.36.106.17:8400/'
+// 公司测试服务
+var fuwu = 'http://192.168.50.4:8400/'
+// var fuwu = 'http://121.36.106.17:8400/'
+// 铜川正式
+//  var fuwu = 'http://61.134.55.234:9999/'
+// 铜川测试
+// var fuwu = 'http://61.134.55.234:9999/'
+// var fuwu = 'http://60.222.250.39:8300/'
+// 韶关
+// var fuwu = 'http://119.146.1.106:8300/'
+// 巩义测试服务
+// var fuwu = 'http://192.168.0.227:8400'
+// 燎原测试服务
+// var fuwu = 'http://121.41.19.238:8400  '
+// var fuwu = 'http://121.41.19.238:9001/'
+
+// var fuwu = 'http://139.214.92.34:8301/'
+
+var proxyTable = {
+  '/rs/logic/saleExport': {
+    target: fuwu
+  },
+  '/rs/logic/saleGetExportProgress': {
+    target: fuwu
+  },
+  '/files': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData': {
+    target: fuwu
+  },
+  '/invoice': {
+    target: fuwu
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: fuwu
+  },
+  '/rs/path/getParams': {
+    target: fuwu
+  },
+  '/rs/data': {
+    target: fuwu
+  },
+  '/rs/license': {
+    target: fuwu
+  },
+  '/rs/db': {
+    target: fuwu
+  },
+  '/excel': {
+    target: fuwu
+  },
+  '/rs/config': {
+    target: fuwu
+  },
+  '/rs/sql/getLicenseById': {
+    target: fuwu
+  },
+  '/rs/sql/manage_getarealist': {
+    target: fuwu
+  },
+  '/rs/sql/manage_getstreetlist': {
+    target: fuwu
+  },
+  '/rs/report': {
+    target: 'http://121.36.106.17:8400/'
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/webmeter': {
+    target: fuwu
+  },
+  '/rs': {
+    // target: 'http://192.168.30.63:8081/'
+    // target: 'http://121.36.106.17:8400/'
+    target: bendi
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+module.exports = app.listen(8089, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8089')
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.6",
+  "version": "3.5.7-dg",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -25,7 +25,7 @@
     "yarn": "^1.22.10"
   },
   "devDependencies": {
-    "address-client": "3.2.27",
+    "address-client": "3.2.29",
     "axios": "0.15.3",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",
@@ -86,9 +86,9 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.2.0-2",
+    "system-clients": "3.2.25",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.52",
+    "vue-client": "1.24.67",
     "vue-clipboard2": "0.3.1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",

package/src/components/FilesManage/FileUserFiles.vue

@@ -42,6 +42,7 @@
                           class="form-group button-range">
                     <!--<button class="button_search button_spacing" style="width: 90px" @click="$parent.$parent.showFileInfo()">查看批量状态-->
                     <!--</button>-->
+                    <button class="button_search button_spacing" type="button" @click="$parent.$parent.goChargeManage()">去收费</button>
 
                     <button @click="search(), $parent.$parent.clean()" class="button_search button_spacing"
                             style="float: right">查询
@@ -57,8 +58,6 @@
                     <button @click="$parent.$parent.importFile" class="button_export button_spacing"
                             style="float: right" v-if="false">导入
                     </button>
-                    <button  class="button_search button_spacing" style="width: 90px" @click="$parent.$parent.downloadFiles()">模板下载
-                    </button>
                     <!--                    <button class="button_search" style="width: 90px" @click=" $parent.$parent.selectaddress()">选择地址</button>-->
                     <button @click="$parent.$parent.xiaohu()"
                             class="button_delete button_spacing"
@@ -66,6 +65,7 @@
                             v-if="$parent.$parent.rows  && $parent.$parent.rows.length > 1 && this.$login.r.includes('批量销户')">
                       批量销户
                     </button>
+                    <import-excel v-if="$parent.$parent.bacthPin === '销户导入'" template-btn-name= "销户模板" template-name= "销户模板" btn-name="导入销户" logic-name="batchpinusers" import-json="pinuser.json"></import-excel>
                     <button  @click="$parent.$parent.bulkOperations('批量销户', 'batch-cancellation')"
                             class="button_delete button_spacing"
                             style="float: right"
@@ -228,7 +228,7 @@
                   </div>
                   <div
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
-                          class="form-group" v-if="titleShow">
+                          class="form-group" >
                     <label class="font_normal_body">使用类型</label>
                     <v-select :options='$parent.$parent.useoptions' :search='true'
                               :value.sync="model.f_usetype"
@@ -238,7 +238,7 @@
                   </div>
                   <div
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
-                          class="form-group" v-if="titleShow">
+                          class="form-group" >
                     <label class="font_normal_body">用户等级</label>
                     <v-select :options='$parent.$parent.userlevel' :search='true'
                               :value.sync="model.userlevel"
@@ -248,7 +248,7 @@
                   </div>
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
-                    class="form-group" v-if="titleShow">
+                    class="form-group" >
                     <label class="font_normal_body">工业备注</label>
                     <v-select :options='$parent.$parent.industrycomments' :value.sync="model.f_gongye_type"
                               close-on-select condition="f_gongye_type='{}'"
@@ -331,7 +331,7 @@
                   <th v-if="!$parent.$parent.$parent.createFile">
                     <nobr>状态</nobr>
                   </th>
-                  <th v-if="titleShow">
+                  <th >
                     <nobr>用户等级</nobr>
                   </th>
                   <!--<th>-->
@@ -362,7 +362,7 @@
                 <td style="text-align: center;">{{row.f_whether_hairpin}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_userfiles_address}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_user_state}}</td>
-                <td style="text-align: center;" v-if="titleShow">{{row.f_user_level}}</td>
+                <td style="text-align: center;" >{{row.f_user_level}}</td>
                 <td style="text-align: center;">
                   <button type="button" name="button" class="button_search-2 button_spacing width-60"
                           v-if="row.f_user_state === '正常' || row.f_user_state==='预备'"
@@ -405,9 +405,11 @@
       <footer slot="modal-footer" class="modal-footer">
       </footer>
     </modal>
-    <modal :show.sync="batchMeterShow" width="500px" title="文件导入" v-ref:modal large backdrop="false">
+    <modal :show.sync="batchMeterShow" width="570px" title="文件导入" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body">
-        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <file-upload class="my-file-uploader col-sm-9" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <button  class="button_clear btn-gn"  style="margin-top: 10px;background-color: #6aa6e2;"  @click="downloadFiles()">模板下载
+        </button>
       </article>
       <footer slot="modal-footer" class="modal-footer">
       </footer>
@@ -503,6 +505,7 @@ let loadParamGem = async function (self) {
           createType: ['address', 'area'],  // 建档方式： address-地址建档  area-小区建档
           hasLimit: true
         },
+        bacthPin: '',
         model: new PagedList('rs/sql/filemanage_getUserfies', 30, {orderitem: '"f_userinfo_id DESC"'}),
         row: null, // 选择一条客户信息，对其进行修改
         areainfo: null, // 小区批量建档使用的数据
@@ -581,6 +584,7 @@ let loadParamGem = async function (self) {
         newdata: {},
         resdata: '',
         resshow: false,
+        batchpinshow: false, // 导入销户
         titleShow: true, //是否显示部分档案信息类的筛选框
         useoptions: this.$appdata.getParam('使用类型'),
 
@@ -590,6 +594,7 @@ let loadParamGem = async function (self) {
     ready () {
       loadParamGem(this)
       this.titleShow = this.$appdata.getSingleValue('是否显示筛选框') == null? true : this.$appdata.getSingleValue('是否显示筛选框')
+      this.getAuthority()
     },
     compiled () {
       window.onresize = () => {
@@ -599,6 +604,11 @@ let loadParamGem = async function (self) {
       }
   },
     methods: {
+      getAuthority () {
+        if (this.$login.r.find(value => value == '销户导入')) {
+          this.bacthPin = '销户导入'
+        }
+      },
       getRes (obj) {
         console.log("-----------------")
         this.orgcondition = obj
@@ -848,6 +858,9 @@ let loadParamGem = async function (self) {
       importFile () {
         this.show = true
       },
+      pin () {
+        this.batchpinshow = true
+      },
       clear () {
         Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
           this.$refs.paged.$refs.criteria.model[key] = []

package/src/components/FilesManage/MeterinfoTest.vue

@@ -43,7 +43,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' v-ref:brand></v-select>
+                      search @change='brandChange' v-model='row.gasbrand' :disabled="curuser.f_user_state != '预备'" 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>
@@ -51,7 +51,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 ' v-ref:model></v-select>
+                      v-model='row.gasmodel' :disabled="row.gasbrand.length === 0 || curuser.f_user_state != '预备'" v-ref:model></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_meter_base" class="font_normal_body">&ensp;累购气量</label>
@@ -185,7 +185,8 @@
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">表具使用年限</label>
-            <input type="number" class="input_search" style="width:60%" v-model="fireinfo.f_use_limit"
+            <input type="number" class="input_search" style="width:60%" v-model="row.f_use_limit"
+                   :value.sync="row.f_use_limit"
                    placeholder='表具使用年限' >
           </div>
           <div class="col-sm-4 form-group">
@@ -202,6 +203,7 @@
             <datepicker style="width:60%" placeholder="通气日期"
                         v-model="row.f_gas_date"
                         v-ref:f_gas_date
+                        @change="gasDateChange"
                         :value.sync="row.f_gas_date"
                         :format="'yyyy-MM-dd HH:mm:ss'"
             ></datepicker>
@@ -565,10 +567,10 @@
         templat: '' //  临时纬度
       }
     },
-    props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id','overdueset'],
+    props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'overdueset', 'curuser'],
     async ready () {
       console.log('看看meter里面的数据', this.meter, this.row)
-      this.row = Object.assign(this.row, this.meter, {})
+      this.row = Object.assign(this.row, this.meter, {f_use_limit : this.$appdata.getSingleValue('报废年限')})
       if(this.row.f_meter_classify){
         if(this.row.f_meter_classify==='物联网表'){
           this.isiot=true
@@ -586,6 +588,16 @@
       co(meterBookGen(this))
     },
     methods: {
+      gasDateChange () {
+        if (!this.row.f_scrap_date && this.row.f_gas_date) {
+          if (this.row.f_use_limit) {
+            let date = new Date(this.row.f_gas_date)
+            let year = date.getFullYear() + (this.row.f_use_limit / 1)
+            this.$set('row.f_scrap_date', year + this.row.f_gas_date.slice(4))
+
+          }
+        }
+      },
       // 获取集中器下拉框
       async getConcentrators () {
         let condition = {
@@ -795,7 +807,6 @@
           this.ratioshow = false
         }
       }
-
     },
     computed: {
 

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -106,6 +106,13 @@
             <input type="text" v-model="baseinfo.base.f_zuhu_phone" class="input_search" style="width:60%"
                    placeholder="租户电话">
           </div>
+        </div>
+        <div class="row">
+          <div style="" class="col-sm-8 form-group">
+            <label for="f_zuhu_idnumber" class="font_normal_body">租户身份证</label>
+            <input type="text" v-model="baseinfo.base.f_zuhu_idnumber" class="input_search" style="width:80%"
+                   placeholder="租户身份证">
+          </div>
           <div style="" class="col-sm-4 form-group">
             <label for="f_is_mgq" class="font_normal_body ">&ensp;付款类型</label>
             <v-select id="f_is_mgq" :value.sync="baseinfo.base.f_cost_type"  v-model="baseinfo.base.f_cost_type"
@@ -127,12 +134,12 @@
           </div>
         </div>
         <div class="row">
-<!--          <div style="" class="col-sm-4 form-group">-->
-<!--            <label for="f_user_level" class="font_normal_body ">&ensp;用户等级</label>-->
-<!--            <v-select :value.sync="baseinfo.base.f_user_level" :search="false" :value-single="true"-->
-<!--                      :options='userlevel' placeholder='用户等级' close-on-select>-->
-<!--            </v-select>-->
-<!--          </div>-->
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_user_level" class="font_normal_body ">&ensp;用户等级</label>
+            <v-select :value.sync="baseinfo.base.f_user_level" :search="false" :value-single="true"
+                      :options='userlevel' placeholder='用户等级' close-on-select>
+            </v-select>
+          </div>
           <div class="col-sm-4 form-group">
             <label for="f_user_nature" class="font_normal_body" title="用户性质">&ensp;用气类型</label>
             <input type="text" v-show="false" v-model="baseinfo.base.f_user_nature">