sale-client 3.5.148 → 3.5.151

package/build/dev-server.js

@@ -1,195 +1,195 @@
-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.99.85.14:8400'
-var fuwu = 'http://39.108.82.124:8400'
-// var fuwu = 'http://47.93.217.125: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(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://192.168.50.4:8400'
+// var fuwu = 'http://39.99.85.14:8400'
+var fuwu = 'http://121.36.60.63:8800/'
+// var fuwu = 'http://47.93.217.125: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(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.148",
+  "version": "3.5.151",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/FilesManage/MeterinfoTest.vue

@@ -113,6 +113,10 @@
             <v-select :value.sync="row.f_concentrator_id" :options='concentrators' value-single placeholder='集中器' close-on-select v-else
                       search v-model='row.f_concentrator_id' :disabled="false"></v-select>
           </div>
+          <div class="col-sm-4 form-group" v-if="(row.gasbrand.length > 0 && ((row.gasbrand[0].f_meter_type == '物联网表' && row.gasbrand[0].f_hascard == '是') || (row.f_meter_classify.includes('卡表'))) && row.f_user_id )">
+            <label class="font_normal_body">&ensp;卡&emsp;&emsp;号</label>
+            <input type="number" class="input_search" style="width:60%" v-model="row.f_card_id" placeholder='卡号' @blur="checkCardId" :disabled="!jurisdiction.includes('卡号修改')">
+          </div>
         </div>
         <div>
           <a style="font-size: 16px;font-weight: 500;">气价信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
@@ -539,6 +543,8 @@
         show: false,
         field: '',
         ratioshow: false,
+        // 原本的卡号
+        orginCardId: '',
         userfileid: '',
         gasid: '',
         gastype: 'userfiles',
@@ -571,6 +577,7 @@
     async ready () {
       console.log('看看meter里面的数据', this.meter, this.row)
       this.row = Object.assign(this.row, this.meter, {f_use_limit : this.$appdata.getSingleValue('报废年限')})
+      this.orginCardId = this.row.f_card_id
       if(this.row.f_meter_classify){
         if(this.row.f_meter_classify==='物联网表'){
           this.isiot=true
@@ -588,6 +595,21 @@
       co(meterBookGen(this))
     },
     methods: {
+      checkCardId() {
+        this.$resetpost('rs/logic/checkCardId', {
+          data: {
+            f_userfiles_id: this.row.f_userfiles_id,
+            gasbrandId: this.row.f_gasbrand_id,
+            cardId: this.row.f_card_id,
+            f_orgid: this.row.f_orgid
+          }
+        }, {resolveMsg: null, rejectMsg: '获取表号出错'}).then(res => {
+          if(res.data.code !== '200') {
+            this.row.f_card_id = this.orginCardId
+            this.$showAlert(res.data.msg,'warning',1500)
+          }
+        })
+      },
       gasDateChange () {
         if (!this.row.f_scrap_date && this.row.f_gas_date) {
           if (this.row.f_use_limit) {

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -333,28 +333,15 @@ export default {
       if (!this.filechangeDetailsShow) this.confirmation()
     },
     confirmation () {
-      // 权限判断, 没有修改权限,只可以修改电话
-      // if (this.filechangeDetailsShow && this.filechangeDetails.rows.find(value => value.f_field_name != '用户电话')) {
-      //   if (!this.$login.r.find(value => value == '档案信息查询修改')) {
-      //     this.$showMessage('当前登陆用户没有档案信息查询修改权限, 只能修改用户电话!')
-      //     return
-      //   }
-      // }
       if (this.fileSaveData.reason && this.fileSaveData.reason !== '其他') {
         this.fileSaveData.modifyReason = this.fileSaveData.reason
       }
-      //console.log('row-------->', this.row)
-      //console.log('this.filechangeDetails.rows:-----',this.filechangeDetails.rows)
-      for (let i = 0;i< this.filechangeDetails.rows.length;i++) {
-        //console.log('循环查看row里面的值---------->',this.filechangeDetails.rows[i])
-        //console.log('循环查看修改项---------->',this.filechangeDetails.rows[i].f_field_name)
+      for (let i = 0; i < this.filechangeDetails.rows.length; i++) {
         if (this.filechangeDetails.rows[i].f_field_name === '通气日期') {
-          //console.log('----------有通气日期就进来------------')
           let name = this.$login.f.name
           let nameId = this.$login.f.id
           let parentname = this.$login.f.deps
           let parentnameId = this.$login.f.depids
-          console.log('验证进来了--------------->', name, parentname)
           this.fileSaveData.userinfo.f_operator = name
           this.fileSaveData.userinfo.f_operatorid = nameId
           this.fileSaveData.userinfo.f_depname = parentname

package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -51,6 +51,9 @@
         <saletab header="指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('指令查看')">
           <query-instruct  :row="row" v-if="show == '指令查看'" @deal-msg="dealMsg"></query-instruct>
         </saletab>
+        <saletab header="历史指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('历史指令查看')">
+          <query-history-instruct  :row="row" v-if="show == '历史指令查看'" @deal-msg="dealMsg"></query-history-instruct>
+        </saletab>
         <saletab header="异常报警" v-if="row.f_meter_type.includes('物联网表')&&permission('异常报警')">
           <watch-warning  :row="row" v-if="show == '异常报警'" @deal-msg="dealMsg"></watch-warning>
         </saletab>
@@ -91,6 +94,7 @@
   import MachineRecordQuery from './ic_detail/MachineRecordQuery'
   // 导入物联网相关查询
   import QueryInstruct from './iot_detail/QueryInstruct'
+  import QueryHistoryInstruct from './iot_detail/QueryHistoryInstruct'
   import WatchCollection from './iot_detail/WatchCollection'
   import WatchWarning from './iot_detail/WatchWarning'
   import PriceChangeQueryUser from './ic_detail/PriceChangeQueryUser'
@@ -117,6 +121,7 @@ export default {
       WatchWarning,
       WatchCollection,
       QueryInstruct,
+      QueryHistoryInstruct,
       ChangeRecord,
       CardHandRecord,
       MeterParam,