sale-client 3.4.104 → 3.4.107

package/build/dev-server.js

@@ -1,157 +1,157 @@
-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://119.146.1.106:8300/'
-// 公司测试服务
-var fuwu = 'http://192.168.50.4: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://127.0.0.1:8079'
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/rs': {
-    // target: 'http://192.168.30.63:8081/'
-    // target: 'http://127.0.0.1:8080'
-    target: fuwu
-  }
-}
-
-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://127.0.0.1:8080/',bendi1 = 'http://119.146.1.106:8300/'
+// 公司测试服务
+var fuwu = 'http://192.168.50.4: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://127.0.0.1:8079'
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/rs': {
+    // target: 'http://192.168.30.63:8081/'
+    target: 'http://127.0.0.1:8080'
+    // target:fuwu
+  }
+}
+
+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.4.104",
+  "version": "3.4.107",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/FilesManage/UserDeviceInfoTest.vue

@@ -56,8 +56,11 @@
               <div class="row auto" style="margin-left: 10px;">
                 <div class="col-sm-6 form-group" style="padding-right: 5px;" :class="[row.f_devices_type == '壁挂炉' && (row.f_input_person == '' || row.f_input_person == null) ? 'has-error' : '']">
                   <label class="font_normal_body">安装人&nbsp;&nbsp;&nbsp;</label>
-                  <input type="text" class="input_search" style="width:60%" v-model="row.f_input_person"
-                         placeholder='安装人'>
+<!--                  <input type="text" class="input_search" style="width:60%" v-model="row.f_input_person"-->
+<!--                         placeholder='安装人'>-->
+                  <v-select :value.sync="row.f_input_person" v-model="row.f_input_person"
+                            :options='installperson' placeholder='安装人'
+                            close-on-select></v-select>
                 </div>
                 <div class="col-sm-6 form-group" style="padding-right: 5px;" :class="[row.f_devices_type == '壁挂炉' && row.f_input_date == '' ? 'has-error' : '']">
                   <label class="font_normal_body">安装日期</label>
@@ -264,6 +267,18 @@ export default {
     }
   },
   computed: {
+    installperson () {
+      // return this.$login.f.f_installman
+      let rs = new Array()
+      for (let i = 0; i < this.$login.f.f_installman.length; i++) {
+        let temp = {
+          label: this.$login.f.f_installman[i].name,
+          value: this.$login.f.f_installman[i].name
+        }
+        rs.push(temp)
+      }
+      return rs
+    },
   },
   methods: {
     showTableBtn () {

package/src/components/FilesManage/UserMeterInfoTest.vue

@@ -1,155 +1,155 @@
-<template>
-  <div class="auto">
-    <div class="" v-for="row in meterinfo">
-      <div style="margin-bottom: 2%; margin-top: 2%">
-        <img style="margin-top: -5px" src="../../../static/images/lefticon/矩形1183.png">
-        <a style="font-size: 20px;font-weight: 500;">表具{{$index+1}}信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
-        <button class="button_search" style="width: max-content" @click="deleteMeter($index, row)" v-if="!row.f_table_state ">删除表具
-        </button>
-        <button class="button_search" style="width: max-content" @click="showDevices($index, row)">用气设备信息</button>
-        <button class="button_search" style="width: max-content" @click="showFire($index, row)">点火信息</button>
-      </div>
-      <file-meter-info :meter="row" :f_filialeid="f_filialeid" :usertype="usertype" :gasproperties="gasproperties" :overdueset="overdueset" @self-valid='valida'
-                  @delete-meter="deleteMeter($index)" :f_userinfo_id="f_userinfo_id"></file-meter-info>
-      <file-user-fire-info @clearfire="clearfire(row)" :addressinfo="addressinfo" :fireinfo.sync="fireinfo" :show_fire.sync="show_fire"  :meter.sync="row"  :baseinfo.sync="baseinfo"
-                           :userinfoid='data.baseinfo.base.f_userinfo_id'></file-user-fire-info>
-
-    </div>
-    <div class="panel panel-default auto text-center" @click="addMeter()" style="cursor: pointer;" v-if="permission('建档一户多表')">
-      <span class="glyphicon glyphicon-plus"></span>
-      <!--<img :src="imgmeter" alt="图片加载失败" class="img-rounded" style="width: 50px;margin:10px;">-->
-    </div>
-    <file-user-device-info :devicesinfo.sync="devicesinfo" :show_devices.sync="show_devices"
-                       :f_input_person="f_input_person"    :userinfoid='data.baseinfo.base.f_userinfo_id'></file-user-device-info>
-     </div>
-</template>
-
-<script>
-  import UserDeviceInfoTest from './UserDeviceInfoTest'
-export default {
-    components: {UserDeviceInfoTest},
-    title: '表具信息',
-    data () {
-      return {
-        pricenames: [],
-        devicesinfo: [],
-        show_devices: false,
-        fireinfo : {},
-        f_input_person: '',
-        show_fire: false,
-        imgdelete: '/images/mainicon/deletedevice.png',
-        imgsrc: '/images/mainicon/biaopan.png',
-        imgmeter: '/images/mainicon/addmeter.png'
-      }
-    },
-    // props: ['meterinfo', 'usertype', 'gasproperties', 'metervalid'],
-
-    props: {
-      meterinfo: [],
-      usertype: {},
-      gasproperties: {},
-      metervalid: {
-        twoWay: true
-      },
-      addressinfo:{},
-      baseinfo:{},
-      f_filialeid: {},
-      f_userinfo_id: {},
-      overdueset:{}
-    },
-    ready () {
-      console.log('表具信息，，，，', this.meterinfo)
-    },
-    methods: {
-      permission (name) {
-        if (!this.$login.r.find(value => value == name)) {
-          return false
-        }
-        return true
-      },
-      isNull (value) {
-        return value && value.length > 0
-      },
-      addMeter () {
-        this.meterinfo.push({
-          // 表号
-          f_meternumber: '',
-          f_metertitles: '',
-          f_area_code: '',
-          // 气表品牌
-          gasbrand: '',
-          // 气表型号
-          gasmodel: '',
-          // 气表类型
-          gasmodeltype: '',
-          pricetype: '', // 气价类型
-          pricename: '', // 气价名称
-          f_user_type: '', // 用户类型
-          f_gasproperties: '', // 用气性质
-          f_inputtor: '',
-          // 安装位置
-          f_position: '',
-          f_subscribe_date: '',
-          // 左右表
-          f_aroundmeter: '',
-          f_garbage_fee: '',
-          f_meter_base: '',
-          // 安装人
-          f_instaler_person: '',
-          // 通气人
-          f_gas_person: '',
-          f_adjustable: '', // 调压箱
-          devicesinfo: [],
-          fireinfo: {}
-        })
-      },
-
-      showDevices (index, row) {
-        this.devicesinfo = []
-        this.show_devices = true
-        this.devicesinfo = row.devicesinfo
-        if ( row.f_install_person[0]) {
-          this.f_input_person = row.f_install_person[0]
-        }
-        console.log('查看设备信息', this.devicesinfo)
-      },
-      showFire (index, row) {
-        if(row.f_user_type.length==0){
-          this.$showAlert('请先确定客户类型', 'warning', 3000)
-        }else{
-          this.fireinfo = {}
-          this.show_fire = true
-          this.fireinfo = row.fireinfo?row.fireinfo:{}
-        }
-      },
-      // 清楚表具信息
-
-      clearMeter () {
-        this.meterinfo = []
-      },
-      deleteMeter (index) {
-        this.meterinfo.splice(index, 1)
-        this.valida()
-      },
-      valida () {
-        for (var i = 0; i < this.meterinfo.length; i++) {
-          console.log('表具信息验证', this.meterinfo, this.meterinfo[i].valid)
-          if (!this.meterinfo[i].valid) {
-            this.metervalid = false
-            return
-          }
-        }
-        this.metervalid = true
-      }
-    }
-  }
-</script>
-<style lang="less">
-  .user-meter-padding {
-    .form-group {
-      > div {
-        padding-right: 5px;
-      }
-    }
-  }
-</style>
+<template>
+  <div class="auto">
+    <div class="" v-for="row in meterinfo">
+      <div style="margin-bottom: 2%; margin-top: 2%">
+        <img style="margin-top: -5px" src="../../../static/images/lefticon/矩形1183.png">
+        <a style="font-size: 20px;font-weight: 500;">表具{{$index+1}}信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
+        <button class="button_search" style="width: max-content" @click="deleteMeter($index, row)" v-if="!row.f_table_state ">删除表具
+        </button>
+        <button class="button_search" style="width: max-content" @click="showDevices($index, row)">用气设备信息</button>
+        <button class="button_search" style="width: max-content" @click="showFire($index, row)">点火信息</button>
+      </div>
+      <file-meter-info :meter="row" :f_filialeid="f_filialeid" :usertype="usertype" :gasproperties="gasproperties" :overdueset="overdueset" @self-valid='valida'
+                  @delete-meter="deleteMeter($index)" :f_userinfo_id="f_userinfo_id"></file-meter-info>
+      <file-user-fire-info @clearfire="clearfire(row)" :addressinfo="addressinfo" :fireinfo.sync="fireinfo" :show_fire.sync="show_fire"  :meter.sync="row"  :baseinfo.sync="baseinfo"
+                           :userinfoid='data.baseinfo.base.f_userinfo_id'></file-user-fire-info>
+
+    </div>
+    <div class="panel panel-default auto text-center" @click="addMeter()" style="cursor: pointer;" v-if="permission('建档一户多表')">
+      <span class="glyphicon glyphicon-plus"></span>
+      <!--<img :src="imgmeter" alt="图片加载失败" class="img-rounded" style="width: 50px;margin:10px;">-->
+    </div>
+    <file-user-device-info :devicesinfo.sync="devicesinfo" :show_devices.sync="show_devices"
+                       :f_input_person="f_input_person"    :userinfoid='data.baseinfo.base.f_userinfo_id'></file-user-device-info>
+     </div>
+</template>
+
+<script>
+  import UserDeviceInfoTest from './UserDeviceInfoTest'
+export default {
+    components: {UserDeviceInfoTest},
+    title: '表具信息',
+    data () {
+      return {
+        pricenames: [],
+        devicesinfo: [],
+        show_devices: false,
+        fireinfo : {},
+        f_input_person: '',
+        show_fire: false,
+        imgdelete: '/images/mainicon/deletedevice.png',
+        imgsrc: '/images/mainicon/biaopan.png',
+        imgmeter: '/images/mainicon/addmeter.png'
+      }
+    },
+    // props: ['meterinfo', 'usertype', 'gasproperties', 'metervalid'],
+
+    props: {
+      meterinfo: [],
+      usertype: {},
+      gasproperties: {},
+      metervalid: {
+        twoWay: true
+      },
+      addressinfo:{},
+      baseinfo:{},
+      f_filialeid: {},
+      f_userinfo_id: {},
+      overdueset:{}
+    },
+    ready () {
+      console.log('表具信息，，，，', this.meterinfo)
+    },
+    methods: {
+      permission (name) {
+        if (!this.$login.r.find(value => value == name)) {
+          return false
+        }
+        return true
+      },
+      isNull (value) {
+        return value && value.length > 0
+      },
+      addMeter () {
+        this.meterinfo.push({
+          // 表号
+          f_meternumber: '',
+          f_metertitles: '',
+          f_area_code: '',
+          // 气表品牌
+          gasbrand: '',
+          // 气表型号
+          gasmodel: '',
+          // 气表类型
+          gasmodeltype: '',
+          pricetype: '', // 气价类型
+          pricename: '', // 气价名称
+          f_user_type: '', // 用户类型
+          f_gasproperties: '', // 用气性质
+          f_inputtor: '',
+          // 安装位置
+          f_position: '',
+          f_subscribe_date: '',
+          // 左右表
+          f_aroundmeter: '',
+          f_garbage_fee: '',
+          f_meter_base: '',
+          // 安装人
+          f_instaler_person: '',
+          // 通气人
+          f_gas_person: '',
+          f_adjustable: '', // 调压箱
+          devicesinfo: [],
+          fireinfo: {}
+        })
+      },
+
+      showDevices (index, row) {
+        this.devicesinfo = []
+        this.show_devices = true
+        this.devicesinfo = row.devicesinfo
+        if ( row.f_install_person[0]) {
+          this.f_input_person = row.f_install_person[0]
+        }
+        console.log('查看设备信息', this.devicesinfo)
+      },
+      showFire (index, row) {
+        if(row.f_user_type.length==0){
+          this.$showAlert('请先确定客户类型', 'warning', 3000)
+        }else{
+          this.fireinfo = {}
+          this.show_fire = true
+          this.fireinfo = row.fireinfo?row.fireinfo:{}
+        }
+      },
+      // 清楚表具信息
+
+      clearMeter () {
+        this.meterinfo = []
+      },
+      deleteMeter (index) {
+        this.meterinfo.splice(index, 1)
+        this.valida()
+      },
+      valida () {
+        for (var i = 0; i < this.meterinfo.length; i++) {
+          console.log('表具信息验证', this.meterinfo, this.meterinfo[i].valid)
+          if (!this.meterinfo[i].valid) {
+            this.metervalid = false
+            return
+          }
+        }
+        this.metervalid = true
+      }
+    }
+  }
+</script>
+<style lang="less">
+  .user-meter-padding {
+    .form-group {
+      > div {
+        padding-right: 5px;
+      }
+    }
+  }
+</style>