sale-client 3.5.130 → 3.5.132

package/build/dev-server.js

@@ -1,193 +1,193 @@
-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://192.168.50.4: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/stopBasicLivingNew':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/logic/getBatchOperaPro':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/sql/sale_getUser':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/logic/getOperBtns':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/file/uploadFile':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/business/batchRunExcelDefault/filemanage_fileSave/newSettleFileImport':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/business/batchRunNew/BatchmachineDownHand/machineDownHand':{
-  //   target:'http:127.0.0.1:8080'
-  // },
-  // '/rs/sql/getDownPlan':{
-  //   target:'http:127.0.0.1:8080'
-  // },
-  // '/rs/logic/saleExport': {
-  //   target: fuwu
-  // },
-  // '/rs/logic/saleGetExportProgress': {
-  //   target: fuwu
-  // },
-  // '/rs/logic/getWarningMsg': {
-  //   target: 'http://localhost:8080/'
-  // },
-  '/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: 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(8085, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8085')
-})
+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://192.168.50.4: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/stopBasicLivingNew':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/logic/getBatchOperaPro':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/sql/sale_getUser':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/logic/getOperBtns':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/file/uploadFile':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/business/batchRunExcelDefault/filemanage_fileSave/newSettleFileImport':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/business/batchRunNew/BatchmachineDownHand/machineDownHand':{
+  //   target:'http:127.0.0.1:8080'
+  // },
+  // '/rs/sql/getDownPlan':{
+  //   target:'http:127.0.0.1:8080'
+  // },
+  // '/rs/logic/saleExport': {
+  //   target: fuwu
+  // },
+  // '/rs/logic/saleGetExportProgress': {
+  //   target: fuwu
+  // },
+  // '/rs/logic/getWarningMsg': {
+  //   target: 'http://localhost:8080/'
+  // },
+  '/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://39.108.82.124:8400/'
+  },
+  '/rs': {
+    // target: 'http://192.168.30.63:8081/'
+    // target: 'http://121.36.106.17:8400/'
+    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(8085, 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.130",
+  "version": "3.5.132",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -93,7 +93,7 @@
         </div>
         <div class="row">
           <div class="col-sm-2"></div>
-          <input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
+          <input v-if="fileSaveData.reason ==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">

package/src/components/revenue/machineHandManage/machineHandAudit.vue

@@ -394,7 +394,7 @@
   import * as Util from '../../../Util'
 
   let readyGen = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate =  self.$login.toStartAndEndDateString()[0]
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0]
     self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
     await self.$LoadParams.loadMeterBook(self.f_filialeid)
     self.loadMeterBooks()
@@ -414,12 +414,13 @@
           dep: [],
           user: []
         },
-        config:{
-          examine: false,
+        config: {
+          examine: false
         },
         imgfilename: '',
         // 小区
         residentialArea: [],
+        inputtouPerson: [],
         imgshow: false,
         criteriaShow: false,
         orgCondtionStr: '',
@@ -444,8 +445,8 @@
           'f_adjustable_name': '调压箱名称',
           'f_inputtor': '抄表员'
         },
-        auditState:[{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
-        auditState1:[{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
+        auditState: [{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
+        auditState1: [{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
         meters: [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
         resultstate: this.$appdata.getParam('抄表结果状态'),
         meterstates: this.$appdata.getParam('抄表状态') ? [{
@@ -475,7 +476,7 @@
     methods: {
       // 修正本期底数
       amend (row) {
-        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：'+ row.f_meter_base)
+        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：' + row.f_meter_base)
         if (!tablebase) return
         if (tablebase < 0) {
           this.$showAlert(`底数不能小于0，请注意!`, 'warning', 2000)
@@ -596,9 +597,9 @@
         this.imgshow = false
       },
       imgShow (val) {
-        console.log("-----------val2:",val)
+        console.log('-----------val2:', val)
         this.imgfilename = `rs/image/file/` + val
-        console.log("-----------imgfilename2:",this.imgfilename)
+        console.log('-----------imgfilename2:', this.imgfilename)
         this.imgshow = true
       },
       async getaddress () {
@@ -632,6 +633,17 @@
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }
+        // 抄表员查询条件
+        this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
+        if (this.inputtouPerson.length !== 0) {
+          let str = JSON.stringify(this.inputtouPerson)
+          str = str.replace(/"/g, `'`)
+          str = str.replace(/\[/g, ``)
+          str = str.replace(/\]/g, ``)
+          console.log('=====抄表员model22222222222绑定====', str)
+          // 查询多个抄表员时条件
+          args.condition += ` and f_inputtor in  ( ${str} )`
+        }
         this.excelCondition = args.condition
         this.$refs.paged.$refs.grid.selectInit()
         this.model.search(args.condition, args.model)
@@ -696,7 +708,7 @@
       },
       loadMeterBooks () {
         this.meterbooks = this.$GetSaleParam.getMeterBooks()
-      },
+      }
 
     },
     computed: {

package/src/components/webMeter/paramSaveNew/ParamSet.vue

@@ -397,7 +397,8 @@ export default {
       }
     },
     closeParam () {
-      // this.$refs.form.row={}
+      this.$refs.form.paramtype = undefined
+      this.$refs.form.paramGroup = undefined
       this.showParame = !this.showParame
       // if (this.isCheckAll) {
       this.map.clear()
@@ -406,7 +407,8 @@ export default {
       // this.isCheckAll = false
     },
     clear () {
-      this.$refs.form.paramtype = ''
+      this.$refs.form.paramtype = undefined
+      this.$refs.form.paramGroup = undefined
       // this.isCheckAll = false
       this.showParame = false
       this.map.clear()

package/src/components/webMeter/paramSaveNew/ParamSetForm.vue

@@ -4,38 +4,43 @@
       <div class="col-sm-4">
         <label class="font_normal_body" style="text-align:left">参数类型</label>
       </div>
-      <div class="col-sm-8">
+      <div class="col-sm-4">
+        <v-select
+          placeholder="请选择参数组别"
+          :value.sync="paramGroup"
+          style="width:40%"
+          width="80%"
+          :search="false"
+          :value-single="true"
+          @change="paramGroupChange"
+          v-model="paramGroup"
+          :options='paramGroups'
+          close-on-select
+        ></v-select>
+      </div>
+      <div class="col-sm-4" v-show="['读取','设置'].includes(paramGroup)">
         <v-select
           placeholder="请选择参数类型"
           :value.sync="paramtype"
           style="width:40%"
-          width="40%"
+          width="80%"
+          :search="false"
           :value-single="true"
           v-model="paramtype"
           :options='paramtypes'
           close-on-select
         ></v-select>
       </div>
-      <!--<div class="col-sm-8" >
-        -&#45;&#45;&#45;&#45;{{row.overdueMessageValue}}
-        <input :type="text" v-model="row.overdueMessageValue" :value.sync="row.overdueMessageValue" style="width:70%" placeholder=""  class="input_search">
-      </div>-->
-      <div v-for="(index,data) in newmeterinfo" style="height: auto">
+      <div v-for="(_,data) in newmeterinfo" style="height: auto">
         <div class="col-sm-12" style="height: auto" v-if="data.name===paramtype"
-             v-for="(param_index,param) in data.params">
+             v-for="(_,param) in data.params">
           <div class="col-sm-4">
             <label class="font_normal_body" style="text-align:left">{{ param.name }}：</label>
             <p class="glyphicon glyphicon-info-sign" style="margin-top:5%;color:#4a7cae"
                :title="param.remark + '，当前系统设置默认值为：'+param.default_value"></p>
           </div>
-          <!--          <div class="col-sm-4">-->
-          <!--            <label class="font_normal_body"-->
-          <!--                   style="text-align:left">{{ param.default_value ? `当前默认值为：${param.default_value}；` : '当前未设置默认值' }}</label>-->
-          <!--          </div>-->
           <div class="col-sm-8" v-if="['设置特殊故障是否关阀','设置表功能开关'].includes(paramtype)">
-            <radio-btn v-model="row[param.title]" :value.sync="row[param.title]"></radio-btn>
-            <!--            <label>启用<input type="radio" v-model="param.isenbale"  @click="reMeterinfo(index,param_index,data.params)" :disabled="!param.default_value" value="启用"/></label>-->
-            <!--            <label>保持不变<input type="radio" v-model="param.isenbale" @click="reMeterinfo(index,param_index,data.params)"  value="保持不变"/></label>-->
+            <radio-btn @toggle="radioBtnToggle" :title="param.title" v-model="row[param.title]" :value.sync="row[param.title]"></radio-btn>
           </div>
           <template v-if="!['设置特殊故障是否关阀','设置表功能开关'].includes(paramtype)">
             <div class="col-sm-8" v-if="param.type!=='option'">
@@ -196,7 +201,13 @@ export default {
       paramtype: '',
       param: {},
       history: [],
-      isenbale: false
+      isenbale: false,
+      paramGroups: [{label: '读取', value: '读取'}, {label: '设置', value: '设置'},
+        {label: '设置表功能开关', value: '设置表功能开关'}, {
+          label: '设置特殊故障是否关阀',
+          value: '设置特殊故障是否关阀'
+        }],
+      paramGroup: ''
     }
   },
   ready () {
@@ -222,7 +233,7 @@ export default {
         if (temp && temp.params.length > 0) {
           for (let i = 0; i < temp.params.length; i++) {
             if (['设置特殊故障是否关阀', '设置表功能开关'].includes(val)) {
-              this.row[temp.params[i].title] = '0'
+              this.row[temp.params[i].title] = ['保持不变']
             } else {
               if (temp.params[i].default_value) {
                 this.row[temp.params[i].title] = temp.params[i].default_value
@@ -231,27 +242,49 @@ export default {
           }
         }
         this.row = Object.assign({}, this.row)
-        // if (this.user.length === 1) {
-        //   this.$resetpost('rs/sql/getIotParams', {data: {t_userfiles_id: this.user[0].f_userfiles_id}}, {resolveMsg: null, rejectMsg: null}).then((rat) => {
-        //     this.row = {}
-        //     if (rat.data.length > 0) {
-        //       rat.data.forEach((item) => {
-        //         console.log('=============>this.paramtype', val)
-        //         console.log('=============>item', item.f_param_group_name)
-        //         if (val === item.f_param_group_name) {
-        //           this.$set('row.' + item.f_param_lname, item.f_param_value)
-        //         }
-        //       })
-        //       // let param = JSON.parse(rat.data[0].f_data)
-        //       // console.log(param)
-        //       // this.row= param
-        //     }
-        //   })
-        // }
       }
     }
   },
   methods: {
+    radioBtnToggle (title, value) {
+      // 设置表功能开关 ->  启用时操作 ->  设置
+      // pzwbit0 -> bzwbit0
+      // 设置特殊故障是否关阀 ->  启用时操作 ->  设置
+      // pbit0 -> bbit0
+      // 当启用 为 ['保持不变']时 设置应为 ['保持不变']
+      // 当启用 为 ['启用']时 设置应为 ['启用']
+      // 当启用 为 []时 设置应为 ['启用']
+      // 获取到设置的title
+      // 把第一个p替换成b
+      if (!title.startsWith('p')) {
+        return
+      }
+      let _title = title.replace('p', 'b')
+      if (value.length === 1) {
+        if (value[0] === '保持不变') {
+          this.row[_title] = ['保持不变']
+        } else {
+          this.row[_title] = ['启用']
+        }
+      } else {
+        this.row[_title] = ['启用']
+      }
+      this.row = Object.assign({}, this.row)
+    },
+    paramGroupChange (val) {
+      const tempArr = ['设置特殊故障是否关阀', '设置表功能开关']
+      if (['读取', '设置'].includes(val)) {
+        this.paramtypes = this.newmeterinfo
+          .filter(item => item.theType === val && !tempArr.includes(item.name))
+          .map(item => {
+            return {label: item.name, value: item.name}
+          })
+          .sort((a, b) => a.label.length - b.label.length)
+        this.paramtype = undefined
+        return
+      }
+      this.paramtype = val
+    },
     close () {
       this.row = {}
       this.$dispatch('close')
@@ -399,8 +432,8 @@ export default {
       this.newmeterinfo = [{}]
 
       let res = await this.$resetpost('/webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: val}}, {
-        resolveMsg: '参数已加载',
-        rejectMsg: null
+        resolveMsg: null,
+        rejectMsg: '参数获取失败'
       })
       let allDefaultValue = await this.$resetpost('/rs/sql/getAllDefaultValues', {data: {gasBrandId: val}}, {
         resolveMsg: null,