sale-client 3.5.52 → 3.5.54

package/build/dev-server.js

@@ -1,164 +1,164 @@
-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://39.108.82.124:8400/', bendi1 = 'http://121.36.106.17:8400/'
-// 公司测试服务
-var fuwu = 'http://39.108.82.124: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
-  },
-  '/rs/file': {
-    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')
-})
+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://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
+// 公司测试服务
+var fuwu = 'http://121.36.106.17: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
+  },
+  '/rs/file': {
+    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')
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.52",
+  "version": "3.5.54",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/revenue/third/transferAudit.vue

@@ -0,0 +1,192 @@
+<template>
+  <criteria-paged :model="model" v-ref:paged>
+    <criteria partial='criteria' v-ref:criteria @condition-changed='$parent.selfSearch'>
+      <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+        <div class="row">
+          <div class="col-sm-2 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-2 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-2 form-group">
+            <label class="font_normal_body">处理状态</label>
+            <v-select v-model="model.f_orderstate" style="width:60%"
+                      placeholder='处理状态'
+                      :value.sync="model.f_orderstate"
+                      :options='$parent.$parent.getState'
+                      :value-single="true"
+                      close-on-select value-single>
+            </v-select>
+          </div>
+          <div class="span col-sm-2 form-group button-range" style="float: right">
+            <button class="button_search button_spacing" @click="search()" v-el:cx>查询</button>
+            <button class="button_clear button_spacing" @click="clear">清空</button>
+            <div style="float: right" class="button_spacing"
+                 :class="{'button_shrink_top': criteriaShow,'button_shrink_bottom': !criteriaShow}"
+                 @click="criteriaShow = !criteriaShow"></div>
+          </div>
+          <div class="row" v-show="criteriaShow">
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">联系电话</label>
+              <input type="text" class="input_search"
+                     style="width:60%"
+                     v-model="model.f_phone"
+                     condition="f_phone = '{}'"
+                     placeholder="联系电话"/>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">起始时间</label>
+              <datepicker placeholder='预约时间' style="width:60%"
+                          v-model="model.f_orderdate_start"
+                          :value.sync="model.f_orderdate_start"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="true"
+                          condition="f_orderdate >= '{} 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.f_orderdate_end"
+                          :value.sync="model.f_orderdate_end"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="true"
+                          condition="f_orderdate <= '{} 00:00:00'">
+              </datepicker>
+            </div>
+            s
+          </div>
+        </div>
+      </div>
+    </criteria>
+    <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+      <template partial='head'>
+        <tr>
+          <th>
+            <nobr>用户编号</nobr>
+          </th>
+          <th>
+            <nobr>用户姓名</nobr>
+          </th>
+          <th>
+            <nobr>联系电话</nobr>
+          </th>
+          <th>
+            <nobr>详细地址</nobr>
+          </th>
+          <th>
+            <nobr>备注信息</nobr>
+          </th>
+          <th>
+            <nobr>预约类型</nobr>
+          </th>
+          <th>
+            <nobr>预约时间</nobr>
+          </th>
+          <th>
+            <nobr>处理状态</nobr>
+          </th>
+          <th>
+            <nobr>处理时间</nobr>
+          </th>
+          <th>
+            <nobr>处&ensp;理&ensp;人</nobr>
+          </th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <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_phone ? row.f_phone : f_user_phone }}</td>
+          <td style="text-align:center">{{ row.f_address }}</td>
+          <td style="text-align:center">{{ row.f_orderremark }}</td>
+          <td style="text-align:center">{{ row.f_ordertype }}</td>
+          <td style="text-align:center">{{ row.f_orderdate }}</td>
+          <td style="text-align:center">{{ row.f_orderstate ? row.f_orderstate : '待处理' }}</td>
+          <td style="text-align:center">{{ row.f_disposedate }}</td>
+          <td style="text-align:center">{{ row.f_dispose_operator }}</td>
+        </tr>
+      </template>
+      <template partial='foot'></template>
+    </data-grid>
+  </criteria-paged>
+
+
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+
+export default {
+  data () {
+    return {
+      model: new PagedList('/rs/sql/getorderRepair', 20,
+        {
+          tablename: '`t_order_transfer`',
+          items: '`f_userChange_name,f_userChange_idnumber,f_userChange_phone,f_imgList,f_newImgList`',
+          orderitem: '`f_orderdate`'
+        }),
+      criteriaShow: false
+    }
+  },
+  ready () {
+    // 默认查询待处理状态预约
+    this.search()
+  },
+  methods: {
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+      this.f_filialeids = val[0]
+      this.initAreas(this.f_filialeids)
+    },
+    search () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      if (this.$refs.paged.$refs.criteria.model.f_orderstate) {
+        if (this.$refs.paged.$refs.criteria.model.f_orderstate === '待处理') {
+          args.condition += ' and f_orderstate is null '
+        }
+        if (this.$refs.paged.$refs.criteria.model.f_orderstate === '预约成功') {
+          args.condition += ` and   f_orderstate = '预约成功' `
+        }
+        if (this.$refs.paged.$refs.criteria.model.f_orderstate === '预约失败') {
+          args.condition += ` and   f_orderstate = '预约失败' `
+        }
+      }
+      args.condition = `${args.condition} and f_ordertype='预约过户' and f_orgstr in ${this.f_orgid}`
+      this.model.search(args.condition, args.model)
+    }
+  },
+  computed: {
+    getState () {
+      return [{label: '全部', value: ''}, {label: '待处理', value: '待处理'}, {
+        label: '预约成功',
+        value: '预约成功'
+      }, {label: '预约失败', value: '预约失败'}]
+    },
+    orderType () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('预约类型')]
+    }
+  },
+  watch: {
+    'sliceArea' () {
+      this.model.model.f_slice_area = ''
+    }
+  }
+}
+</script>
+<style lang="less">
+</style>

package/src/filiale/rongcheng/FileUserFiles.vue

@@ -311,6 +311,9 @@
                   <th>
                     <nobr>状态</nobr>
                   </th>
+                  <th>
+                    <nobr>建档日期</nobr>
+                  </th>
                   <th>
                     <nobr>地址状态</nobr>
                   </th>
@@ -337,6 +340,7 @@
                 <td style="text-align: center;">{{row.f_whether_hairpin}}</td>
                 <td style="text-align: center;">{{row.f_gas_date}}</td>
                 <td style="text-align: center;">{{row.f_user_state}}</td>
+                <td style="text-align: center;">{{row.f_createfile_date}}</td>
                 <td style="text-align: center;">{{row.f_address_state}}</td>
                 <td style="text-align: center;">
                   <button type="button" name="button" class="btn btn-link" v-if="row.f_user_state === '正常' || row.f_user_state==='预备'"

package/src/filiale/rongcheng/MeterinfoTest.vue

@@ -9,11 +9,11 @@
                    @blur="meternumberValidate()" placeholder='表号'
                    v-next-el="{id: 'metertitles'}">
           </div>
-          <div class="col-sm-4 form-group">
-            <label for="f_metertitles" class="font_normal_body">&ensp;表&ensp;封&ensp;号</label>
-            <input type="text" class="input_search" style="width:60%" v-model="row.f_metertitles" placeholder='表封号'
-                   v-next-el="{id: 'meterbase'}">
-          </div>
+<!--          <div class="col-sm-4 form-group">-->
+<!--            <label for="f_metertitles" class="font_normal_body">&ensp;表&ensp;封&ensp;号</label>-->
+<!--            <input type="text" class="input_search" style="width:60%" v-model="row.f_metertitles" placeholder='表封号'-->
+<!--                   v-next-el="{id: 'meterbase'}">-->
+<!--          </div>-->
           <div class="col-sm-4 form-group">
             <label for="f_llj_brand" class="font_normal_body">流量计品牌</label>
             <input type="text" class="input_search" style="width:60%" v-model="row.f_llj_brand" placeholder='流量计品牌'
@@ -238,12 +238,12 @@
             <v-select :value.sync="row.f_valve_state" :options='valvestate' placeholder='阀门状态' close-on-select
                       v-model='row.f_valve_state'></v-select>
           </div>
-          <div class="col-sm-4 form-group">
-            <label for="gasmodel" class="font_normal_body">&ensp;垃&ensp;圾&ensp;费</label>
-            <v-select :value.sync="row.f_garbage_fee" :options='garbagefee' placeholder='垃圾费' close-on-select
-                      :value-single="true"
-                      v-model='row.f_garbage_fee'></v-select>
-          </div>
+<!--          <div class="col-sm-4 form-group">-->
+<!--            <label for="gasmodel" class="font_normal_body">&ensp;垃&ensp;圾&ensp;费</label>-->
+<!--            <v-select :value.sync="row.f_garbage_fee" :options='garbagefee' placeholder='垃圾费' close-on-select-->
+<!--                      :value-single="true"-->
+<!--                      v-model='row.f_garbage_fee'></v-select>-->
+<!--          </div>-->
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">&ensp;抄&ensp;表&ensp;员</label>
             <v-select :value.sync="row.f_inputtor" v-model='row.f_inputtor'
@@ -276,11 +276,11 @@
             <label for="f_userfiles_address" class="font_normal_body ">&nbsp;用气点名</label>
             <input class="input_search" style="width:80%" v-model="row.f_userfiles_address"/>
           </div>
-          <div class="col-sm-4 form-group" >
-            <label for="f_limit_sms" class="font_normal_body">&ensp;短信限定</label>
-            <input type="text" class="input_search" style="width:60%" style="width:60%" v-model="row.f_limit_sms"
-                   placeholder='短信限定'></input>
-          </div>
+<!--          <div class="col-sm-4 form-group" >-->
+<!--            <label for="f_limit_sms" class="font_normal_body">&ensp;短信限定</label>-->
+<!--            <input type="text" class="input_search" style="width:60%" style="width:60%" v-model="row.f_limit_sms"-->
+<!--                   placeholder='短信限定'></input>-->
+<!--          </div>-->
           <div style="" class="col-sm-8 form-group">
             <label for="f_comments" class="font_normal_body ">&nbsp;&nbsp;&nbsp;备&nbsp;&nbsp;&nbsp;注&nbsp;</label>
             <input class="input_search" style="width:80%" v-model="row.f_comments"/>

package/src/filiale/rongcheng/UserEssentialInfoTest.vue

@@ -0,0 +1,332 @@
+<template>
+  <div>
+    <validator name='v' @valid="$emit('valid')" @invalid="$emit('invalid')">
+      <form class="form-horizontal select-overspread ">
+        <div class="row">
+          <div class="col-sm-4 form-group " :class="[$v.f_user_name.required ? 'has-error' : '']">
+            <label for="f_user_name" class="font_normal_body">*客户姓名</label>
+            <input type="text" v-model="baseinfo.base.f_user_name" v-validate:f_user_name='{required: true }'
+                   class="input_search" style="width:60%" placeholder="客户名称" v-next-el="phone">
+          </div>
+          <div style="" class="col-sm-4 form-group"
+               :class="[$v.f_user_phone.minlength || $v.f_user_phone.maxlength ? 'has-error' : '']">
+            <label for="f_user_phone" class="font_normal_body">*客户电话</label>
+            <input type="text" maxlength="11" v-model="baseinfo.base.f_user_phone"
+                   v-validate:f_user_phone="{minlength: 11, maxlength: 11  }" class="input_search" style="width:60%"
+                   placeholder="客户电话" v-el:phone v-next-el="area">
+            <button type="button" class="glyphicon glyphicon-plus" @click.stop="phoneManage()"></button>
+          </div>
+          <div class="col-sm-4 form-group" style="" v-if="true">
+            <label for="f_user_state" class="font_normal_body">&ensp;客户状态</label>
+            <v-select :value.sync="baseinfo.base.f_user_state"
+                      :disabled="true"
+                      :value-single="true"
+                      :options='userstates' placeholder='客户状态'
+                      close-on-select></v-select>
+          </div>
+        </div>
+        <div class="row">
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_credentials" class="font_normal_body">&ensp;证件类型</label>
+            <v-select id="idCardType" :value.sync="baseinfo.base.f_credentials"
+                      v-model="baseinfo.base.f_credentials"
+                      :value-single="true"
+                      :options='credentials' placeholder='证件类型'
+                      style="width: 65%"
+                      close-on-select></v-select>
+          </div>
+          <div style="" class="col-sm-8 form-group"
+               :class="[$v.f_idnumber2.identityCardValid ? 'has-error' : '']"
+               v-if="baseinfo.base.f_credentials === '身份证'">
+            <label for="f_idnumber" class="font_normal_body">*证件号码</label>
+            <input type="text" maxlength="18" v-model="baseinfo.base.f_idnumber"
+                   v-validate:f_idnumber2='{identityCardValid: true}' class="input_search" style="width:80%"
+                   placeholder="证件号码">
+          </div>
+          <div style="" class="col-sm-8 form-group" v-if="baseinfo.base.f_credentials !== '身份证'">
+            <label class="font_normal_body">&ensp;证件号码</label>
+            <input type="text" v-model="baseinfo.base.f_idnumber" class="input_search" style="width:80%"
+                   placeholder="证件号码">
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-12 form-group" :class="[$v.f_address.required ? 'has-error' : '']">
+            <label for="f_address" class="font_normal_body">*地址信息</label>
+            <input type="text" v-model="addressinfo.f_address" :value.sync="addressinfo.f_address" v-validate:f_address='{required: true }'
+                   class="input_search" disabled="disabled" style="width:75%;" placeholder="用户地址" >
+            <span>
+              <button class="button_search button_spacing" type="button" style="width: max-content" v-if="!isedit" @click="selectaddress()">选择地址</button>
+              <!--              <button class="button_search button_spacing" type="button" style="width: max-content" v-if="isedit" @click="modifyaddress()">修改地址</button>-->
+              <button class="button_search button_spacing" type="button" style="width: max-content" v-if="isedit" @click="selectaddress()">修改地址</button>
+            </span>
+          </div>
+        </div>
+        <div class="row">
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_used_name" class="font_normal_body">&ensp;曾&ensp;用&ensp;名</label>
+            <input type="text" v-model="baseinfo.base.f_used_name" class="input_search" style="width:60%"
+                   placeholder="曾用名">
+          </div>
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_rent_phone" class="font_normal_body">&ensp;备用电话</label>
+            <input type="text" v-model="baseinfo.base.f_rent_phone" class="input_search" style="width:60%"
+                   placeholder="备用电话">
+          </div>
+          <div class="col-sm-4 form-group" :class="[$v.f_people_num.dctest ? 'has-error' : '']">
+            <label for="f_people_num" class="font_normal_body">&ensp;人&ensp;口&ensp;数</label>
+            <input type="number" v-model="baseinfo.base.f_people_num" v-validate:f_people_num='{dctest: [0, ">=" ]}'
+                   :disabled="!jurisdiction.includes('修改人口数')" class="input_search" style="width:60%"
+                   placeholder="家庭人口数">
+          </div>
+        </div>
+        <div class="row">
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_balance" class="font_normal_body">&ensp;用户余额</label>
+            <input type="text" v-model="baseinfo.base.f_balance" class="input_search" style="width:60%"
+                   placeholder="用户余额" :disabled="!jurisdiction.includes('档案信息查询修改')">
+          </div>
+<!--          <div style="" class="col-sm-4 form-group">-->
+<!--            <label for="f_is_mgq" class="font_normal_body ">煤&ensp;改&ensp;气&ensp;</label>-->
+<!--            <v-select id="f_is_mgq" :value.sync="baseinfo.base.f_is_mgq"  v-model="baseinfo.base.f_is_mgq"-->
+<!--                      :options='mgq' placeholder='是否煤改气'   style="width: 65%"       close-on-select></v-select>-->
+<!--          </div>-->
+<!--          <div class="col-sm-4 form-group">-->
+<!--            <label for="f_contract" class="font_normal_body">&ensp;燃气本号</label>-->
+<!--            <input type="text"  v-model="baseinfo.base.f_book_no" class="input_search" style="width:60%" placeholder="用户证号">-->
+<!--          </div>-->
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_rent_name" class="font_normal_body">&ensp;租户姓名</label>
+            <input type="text" v-model="baseinfo.base.f_rent_name" class="input_search" style="width:60%"
+                   placeholder="租户姓名">
+          </div>
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_zuhu_phone" class="font_normal_body">&ensp;租户电话</label>
+            <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"
+                      :options='costtype' placeholder='付款类型'   style="width: 65%"       close-on-select></v-select>
+          </div>
+        </div>
+        <div class="row">
+<!--          <div class="col-sm-8 form-group">-->
+<!--            <label for="f_contract" class="font_normal_body">&ensp;合同编号</label>-->
+<!--            <input type="text" v-model="baseinfo.base.f_contract_id" class="input_search" style="width:80%"-->
+<!--                   placeholder="合同编号">-->
+<!--          </div>-->
+          <div class="col-sm-4 form-group">
+            <label for="f_user_state" class="font_normal_body">&ensp;房屋类型</label>
+            <input type="text" v-show="false" v-model="baseinfo.base.f_house_type">
+            <v-select :value.sync="baseinfo.base.f_house_type" :search="false" :value-single="true"
+                      :options='housetype' 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">
+            <v-select :value.sync="baseinfo.base.f_user_nature" :search="false" :value-single="true"
+                      :options='usernature' placeholder='用气类型' close-on-select>
+            </v-select>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label for="f_user_nature" class="font_normal_body">&ensp;档案编号</label>
+            <input type="text" v-model="baseinfo.base.f_olduserinfo_code" class="input_search" style="width:60%"
+                   placeholder="档案编号">
+          </div>
+        </div>
+        <div class="row">
+          <div style="" class="col-sm-12 form-group">
+            <label for="f_paper_account" class="font_normal_body ">&ensp;备&emsp;&emsp;注</label>
+            <input class="input_search" style="width:86.5%;height: 40px" v-model="baseinfo.base.f_comments"/>
+          </div>
+        </div>
+
+        <div class="row" style="margin-top: 2%;">
+          <a style="font-size: 16px;font-weight: 500;"
+             v-if="baseinfo.base.f_cost_type[0] === '银行代扣'">银行信息</a>
+        </div>
+        <div v-if="baseinfo.base.f_cost_type[0] === '银行代扣'">
+          <div class="row">
+            <div class="col-sm-4 form-group"
+                 :class="[$v.f_bank_accopen.required ? 'has-error' : '']">
+              <label for="f_username" class="font_normal_body">银行户名</label>
+              <input type="text" v-model="baseinfo.bank.f_bank_accopen"
+                     class="input_search" style="width:60%" id="f_username" placeholder="客户名称"
+                     v-validate:f_bank_accopen='{required: true}'
+                     v-next-el="bankaccount">
+            </div>
+            <div class="col-sm-4 form-group" id=userfiles-useEssInf-银行名称>
+              <label for="f_username" class="font_normal_body ">银行名称</label>
+              <v-select :value.sync="baseinfo.bank.f_bank_name"
+                        :options='banknames' placeholder='银行名称'
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-4 form-group">
+              <label for="f_bank_idnumber" class="font_normal_body">缴费编号</label>
+              <input type="text" v-model="baseinfo.bank.f_bank_pay_number"
+                     class="input_search" style="width:60%"
+                     aria-describedby="helpBlock" placeholder="缴费编号" v-el:bankpaynumber>
+            </div>
+            <div class="col-sm-12 form-group">
+              <label for="f_bank_idnumber" class="font_normal_body">身份证号</label>
+              <input type="text" v-model="baseinfo.bank.f_bank_idnumber"
+                     class="input_search" style="width:54%"
+                     aria-describedby="helpBlock" placeholder="身份证号" v-el:bankidnumber>
+            </div>
+            <div class="col-sm-12 form-group"
+                 :class="[$v.f_bank_account.required ? 'has-error' : '']">
+              <label for="f_userid" class="font_normal_body">银行账号</label>
+              <input type="text" v-model="baseinfo.bank.f_bank_account" class="input_search" style="width:54%"
+                     v-validate:f_bank_account='{required: true}' placeholder="银行账号" v-el:bankaccount
+                     v-next-el="bankidnumber">
+            </div>
+          </div>
+        </div>
+      </form>
+    </validator>
+    <modal v-if="showselectaddress" :show.sync="showselectaddress" width="80%" title="地址信息" v-ref:modal large backdrop="false">
+      <article slot="modal-body" class="modal-body" style="height: 700px;padding: 0!important;">
+        <file-address-manage :is-select="isSelect" :fileinfo="addressinfo"
+                             @address-valid="doNothing"   :showselectaddress.sync="showselectaddress" v-ref:fileaddress ></file-address-manage>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+    <file-user-phone :show.sync="showphone" :userphonelist="userphonelist" :f_userinfo_id="baseinfo.base.f_userinfo_id"></file-user-phone>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+  // import HighMeter from '../../plugins/HighMeterPlugin'
+
+  let getEditUserState = async function (self) {
+    try {
+      let http = new HttpResetClass()
+      let result = await http.load('GET', `rs/vue/EditUserState.json`, {}, {resolveMsg: null, rejectMsg: null})
+      console.log(result.data.EditUserState)
+      self.edituserstate = result.data.EditUserState
+    } catch (e) {
+      console.log(e)
+    }
+  }
+
+  export default {
+    title: '基本信息',
+    props: ['baseinfo', 'addressinfo', 'isedit', 'userphonelist'],
+    data () {
+      return {
+        showselectaddress: false,
+        site: '',
+        showphone: false,
+        areas: [],
+        streets: [],
+        residentials: [],
+        inputtores: this.$appdata.getParam('抄表员'),
+        credentials: this.$appdata.getParam('证件类型'),
+        costtypes: this.$appdata.getParam('缴费类型'),
+        banknames: this.$appdata.getParam('银行名称'),
+        userstates: this.$appdata.getParam('用户状态'),
+        mgq: this.$appdata.getParam('是否煤改气'),
+        costtype: this.$appdata.getParam('付款类型'),
+        usernature: this.$appdata.getParam('用户性质'),
+        userlevel: this.$appdata.getParam('用户等级'),
+        housetype: [{label: '楼房', value: '楼房'}, {label: '自建房', value: '自建房'}],
+        jurisdiction: this.$login.r,
+        edituserstate: false,
+        // highMeterPlugin: {},
+        readCardFlag: true,
+
+        isSelect: false
+      }
+    },
+    ready () {
+      getEditUserState(this)
+      this.$resetValidation()
+      // this.highMeterPlugin = new HighMeter(this,this.readIDCardCallback)
+    },
+    beforeDestroy () {
+      // this.highMeterPlugin.Stop()
+    },
+    methods: {
+      selectaddress () {
+        this.showselectaddress = true
+        this.isSelect = true
+      },
+      modifyaddress () {
+        this.showselectaddress = true
+        this.isSelect = false
+      },
+      onValid (res) {
+        this.$dispatch('valid')
+      },
+      onInvalid (res) {
+        this.$dispatch('invalid')
+      },
+      doNothing () {
+      },
+      readIDCardCallback (compoent, msg) {
+        console.log('进入高拍仪', msg)
+        if (msg.err !== 0) {
+          return
+        }
+        // document.getElementById("idCardType").getElementsByClassName("btn-content")[0].innerHTML="身份证"
+        compoent.baseinfo.base.f_idnumber = msg.strID
+        compoent.baseinfo.base.f_user_name = msg.strName.trim()
+        // compoent.baseinfo.base.f_credentials=["身份证"]
+      },
+      phoneManage () {
+        this.showphone = true
+        console.log('查看用户备用电话信息', this.userphonelist)
+      }
+    },
+    watch: {
+      // 重置验证结果，当证件类型切换时，验证结果不能立即刷新，需要重置
+      'baseinfo.base.f_credentials[0]' () {
+        console.log('验证器重置')
+        this.$resetValidation()
+      },
+      'baseinfo.base.f_cost_type[0]' () {
+        console.log('验证器重置')
+        this.$resetValidation()
+      }
+      // 当选择销户，需要给其提醒是否进行销户
+      // 'baseinfo.base.f_user_state'(val) {
+      //     // if (val[0] === '销户') {
+      //     //     this.$showMessage('是否要对该客户进行销户操作？', ['confirm', 'cancel']).then((res) => {
+      //     //         if (res !== 'confirm') {
+      //     //             this.baseinfo.base.f_user_state = ['正常']
+      //     //         }
+      //     //     })
+      //     // }
+      // }
+    },
+    computed: {},
+    events: {
+      'confirmaddress' (res) {
+        console.log('选定地址', res)
+        this.showselectaddress = false
+        this.addressinfo.f_address = res.f_address
+        this.addressinfo.id = res.id
+        this.$dispatch('defaultOtheret', res)
+      }
+    }
+  }
+</script>

package/src/filiale/rongcheng/sale.js

@@ -33,6 +33,8 @@ let specialComp = {
   'file-user-device-info-new': (resolve) => { require(['./FilesManageNew/UserDeviceInfoTest'], resolve) },
   // 用户基本信息test
   'file-user-essential-info-new': (resolve) => { require(['./FilesManageNew/UserEssentialInfoTest'], resolve) },
+  // 用户基本信息test
+  'file-user-essential-info': (resolve) => { require(['./UserEssentialInfoTest'], resolve) },
   // 用户表具信息test
   'file-user-meter-info-new': (resolve) => { require(['./FilesManageNew/UserMeterInfoTest'], resolve) },
 

package/src/filiale/rongchuang/MeterinfoTest.vue

@@ -184,13 +184,11 @@
                       close-on-select></v-select>
           </div>
           <div class="col-sm-4 form-group" v-show="true">
-            <input type="text" v-model="$refs.f_install_date.value" v-show="false">
             <label for="f_install_date" class="font_normal_body">&ensp;安装日期</label>
             <datepicker style="width:60%" id="startDate" placeholder="安装日期" width='100%'
-                        v-model="f_install_date"
-                        :value.sync="f_install_date"
+                        v-model="row.f_install_date"
+                        :value.sync="row.f_install_date"
                         class="datepicker"
-                        v-ref:f_install_date
                         :format="'yyyy-MM-dd HH:mm:ss'"
                         :show-reset-button="true">
             </datepicker>
@@ -390,7 +388,6 @@ export default {
       ratioshow: false,
       userfileid: '',
       gasid: '',
-      f_install_date: '',
       f_scrap_date: '',
       gastype: 'userfiles',
       showParame: false,
@@ -432,9 +429,6 @@ export default {
     }
     if (this.row.f_install_date == null || this.row.f_install_date == '') {
       this.row.f_install_date = Util.toStandardTimeString()
-      this.f_install_date = Util.toStandardTimeString()
-    } else {
-      this.f_install_date = this.row.f_install_date
     }
     this.getbfrq()
     // this.updatayear(this.f_install_date)

package/src/filiale/shanggao/PaymentCode.vue

@@ -108,7 +108,7 @@
               self.closeTimer()
               return
             }
-            if (times > 12) {
+            if (times > 48) {
               self.$showAlert(`多次查询未成功，请重新扫描用户付款码`, 'danger')
               self.closeTimer()
             }

package/src/plugins/FileManageService.js

@@ -111,7 +111,8 @@ let FileManageService = {
       meter.f_position = meter.f_position.length > 0 ? meter.f_position[0] : null
       meter.f_usetype = meter.f_usetype.length > 0 ? meter.f_usetype[0] : null
       meter.f_usestate = meter.f_usestate.length > 0 ? meter.f_usestate[0] : null
-
+      meter.f_gas_date = meter.f_gas_date && meter.f_gas_date.trim() != '' ? meter.f_gas_date : null
+      meter.f_install_date = meter.f_install_date && meter.f_install_date.trim() != '' ? meter.f_install_date : null
       meter.f_show_way = meter.f_show_way ? meter.f_show_way[0] : null
       meter.f_inputtor = meter.f_inputtor.length > 0 ? meter.f_inputtor[0] : null
       meter.f_gongye_type = meter.f_gongye_type ? meter.f_gongye_type[0] : null

package/src/sale.js

@@ -1117,9 +1117,11 @@ export default function (filiale) {
   // excel导入模板
   Vue.component('import-excel', (resolve) => { require(['./components/revenue/comprehen/common/ImportExcel'], resolve) })
   // 气量核对
-  Vue.component('check-gas', (resolve) => { require(['./components/revenue/base/leftview//CheckGas'], resolve) })
+  Vue.component('check-gas', (resolve) => { require(['./components/revenue/base/leftview/CheckGas'], resolve) })
   // json模板
   Vue.component('json-parse', (resolve) => { require(['./components/revenue/comprehen/common/JSONParse'], resolve) })
+  // 六安第三方过户预约审核页面
+  // Vue.component('transfer-audit', (resolve) => { require(['./components/revenue/third/transferAudit'], resolve) })
 
   // 分公司特殊页面注册替换
   if (filiale) {