sale-client 3.5.40 → 3.5.42

package/build/dev-server.js

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

package/src/components/charge/ChargeList.vue

@@ -372,11 +372,8 @@ let cardBtnGen = async function (self, val) {
         }
       }
     }
-
     // 验证卡上是否有气， 1）. 卡上的气量和金额大于0   2）. 只认累购的表会有一个新参数  NewParam.IsInsert (0: 未接表 1: 已接表)
-
     let cardHasGas = false
-
     if ((self.cardInfo.Gas - 0) > 0 || (self.cardInfo.Money - 0) > 0) {
       cardHasGas = true
     }

package/src/components/charge/business/CardMeterCenter.vue

@@ -763,7 +763,6 @@
         this.clean()
       },
       paymentchange () {
-        console.log('model.f_payment', this.model.f_payment[0])
         if (JSON.stringify(this.model.f_payment).indexOf('转账') !== -1) {
           // 进入转账筛选条件
           this.model.f_banktransfer_person = ''

package/src/components/common/userinfo_detail/iot_detail/QueryInstruct.vue

@@ -84,6 +84,7 @@
             <th style="text-align:center;">
               <nobr>操作类型</nobr>
             </th>
+<!--            查这里-->
             <th style="text-align:center;">
               <nobr>操作状态</nobr>
             </th>
@@ -132,8 +133,10 @@
             <td style="text-align:center;">
               <nobr>{{row.f_type}}</nobr>
             </td>
+<!--            这里-->
             <td style="text-align:center;">
-              <nobr>{{row.f_state}}</nobr>
+              <nobr>{{$parent.$parent.$parent.stateFlow(row)}}</nobr>
+<!--              <nobr>{{row.f_state}}</nobr>-->
             </td>
             <td style="text-align:center;">
               <nobr>{{row.f_operator}}</nobr>
@@ -187,7 +190,7 @@
   import {PagedList} from 'vue-client'
 
   export default {
-    title: '指令页面',
+    title: '指令查看',
     name: 'Querylnstruct',
     props: {
       row: {},
@@ -211,7 +214,6 @@
         cancelid: '',
         f_userfiles_id: '',
         model: new PagedList('rs/sql/insturctDetailQuery', 30),
-        // model: null,
         row: null,
         searchshow: false,
         show: false
@@ -230,6 +232,25 @@
       }
     },
     methods: {
+      stateFlow: function (row) {
+        console.log(row)
+        let state = ""
+        if (row.f_instruct_type.includes("阀门控制")) {
+          let content = JSON.parse(row.f_instruct_content)
+          if (content.isOpen !== null) {
+            if (content.isOpen === 1) {
+              state = "开阀"
+            } else if (content.isOpen === 0) {
+              state = "关阀"
+            } else {
+              state = row.f_state
+            }
+            return state
+          }
+        } else {
+          return row.f_state
+        }
+      },
       clickshow () {
         this.searchshow = !this.searchshow
       },

package/src/components/revenue/comprehen/ComprehenOperation/OverCharge/OverUseCharge.vue

@@ -261,7 +261,7 @@ export default {
     return {
       config: {
         notShowFormula: false, // 不显示计算公式,默认显示
-        showupload: false, // 默认不显示附件
+        showupload: true, // 默认不显示附件
         hasPrint: false,  // 默认打票
         hasBillManage: false,  // 默认不启用发票管理
         billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）

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

@@ -4,8 +4,8 @@
       <criteria :model='model' 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">
-              <label class="font_normal_body" >气表协议类型</label>
+            <div class="col-sm-2 ">
+              <label class="font_normal_body" >协议类型</label>
               <v-select style="width:60%" title="气表协议类型"
                         placeholder='气表协议类型'
                         :value.sync="model.f_metertype"
@@ -15,7 +15,7 @@
                         close-on-select
                         :value-single="true" v-ref:brand>  </v-select>
             </div>
-            <div class="col-sm-2">
+            <div class="col-sm-2 ">
               <label class="font_normal_body">气表品牌</label>
               <v-select
                 placeholder='气表品牌'
@@ -26,7 +26,7 @@
                 condition="f_gasbrand_id = '{}'"
                 close-on-select></v-select>
             </div>
-            <div class="col-sm-2 form-group">
+            <div class="col-sm-2 ">
               <label class="font_normal_body">气表型号</label>
               <v-select :value.sync="model.f_meter_style"
                         v-model="model.f_meter_style"

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

@@ -1,6 +1,6 @@
 <template>
   <div id="unit" class="flex-row">
-    <div class="flex basic-main" style="width:auto;">
+    <div class="flex basic-main" style="max-width:65%;">
       <param-set-default-list v-ref:defaultlist></param-set-default-list>
     </div>
     <div class="flex binary-right" style="flex:1; ">

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

@@ -203,6 +203,10 @@ export default {
             }
           }
         }
+        if (params.length === 0) {
+          this.$showAlert('没有需要设置得参数', 'warning', 2000)
+          return
+        }
         let param = {
           condition: 'g.f_gasbrand_id = ' + this.gasbrandid[0],
           switchCheckAll: this.checked1,
@@ -247,7 +251,10 @@ export default {
             }
           }
         }
-        debugger
+        if (params.length === 0) {
+          this.$showAlert('没有需要设置得参数', 'warning', 2000)
+          return
+        }
         let param = {
           condition: 'g.f_gasbrand_id = ' + this.gasbrandid[0] + ' and f.f_userfiles_id in (' + filesid + ')',
           switchCheckAll: this.checked1,
@@ -292,8 +299,8 @@ export default {
             this.newmeterinfo[i].params[j].isenbale = false
             for (let n = 0; n < allDefaultValue.data.length; n++) {
               if (this.newmeterinfo[i].params[j].name === allDefaultValue.data[n].f_param_name && this.newmeterinfo[i].name === allDefaultValue.data[n].f_group_name && allDefaultValue.data[n].f_param_title === this.newmeterinfo[i].params[j].title) {
-                this.newmeterinfo[i].params[j].default_value = allDefaultValue.data[i].f_param_value
-                this.newmeterinfo[i].params[j].default_id = allDefaultValue.data[i].default_id
+                this.newmeterinfo[i].params[j].default_value = allDefaultValue.data[n].f_param_value
+                this.newmeterinfo[i].params[j].default_id = allDefaultValue.data[n].default_id
                 break
               }
             }