sale-client 3.5.17 → 3.5.18

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://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')
-})
+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:8072',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.17",
+  "version": "3.5.18",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/UserFiles/AdjustableBox/AddBox.vue

@@ -140,18 +140,18 @@
 </template>
 <script>
 
-import {HttpResetClass} from "vue-client";
+import {HttpResetClass} from 'vue-client'
 
 export default {
   data () {
     return {
       isshow: false,
       tempPosition: {
-        position: { //经纬度信息
-          lng: 0, //经度
-          lat: 0  //纬度
+        position: { // 经纬度信息
+          lng: 0, // 经度
+          lat: 0  // 纬度
         },
-        formattedAddress: '' //地址信息
+        formattedAddress: '' // 地址信息
       },
       model: {
         f_adjustable_id: '',
@@ -165,11 +165,11 @@ export default {
         f_open_date: '',
         f_manufacturer: '',
         f_remark: '',
-        f_adjustable_lng: '', //经度
-        f_adjustable_lat: '',  //纬度
+        f_adjustable_lng: '', // 经度
+        f_adjustable_lat: ''  // 纬度
       },
-      riser:[{}],
-      delrow:[],
+      riser: [{}],
+      delrow: [],
       haveid: false,
       havename: false,
       changedate: true,
@@ -206,44 +206,46 @@ export default {
       this.model.f_depid = this.$login.f.depids
       this.model.f_depname = this.$login.f.deps
       let http = new HttpResetClass()
-      let res=await http.load('post', `rs/entity/t_adjustablebox`, this.model,{resolveMsg:'调压箱保存成功', rejectMsg: '保存失败!!!'})
-          if(this.riser[0]){
-            for(var i=0;i<this.riser.length;i++){
-              var params={
-                id:this.riser[i].id,
-                f_table_name:`t_adjustablebox`,
-                f_field_name:'id',
-                f_parent_id:res.data.id,
-                f_value:this.riser[i].f_value,
-                f_chinese_name:'立管编号',
-                f_operator : this.$login.f.name,
-                f_operatorid : this.$login.f.id,
-                f_orgid : this.$login.f.orgid,
-                f_orgname : this.$login.f.orgs,
-                f_depid : this.$login.f.depids,
-                f_depname : this.$login.f.deps
-              }
-              if(this.riser[i].f_value){
-                await http.load('post', `rs/entity/t_attribute`, params, {resolveMsg: null, rejectMsg: null})
-              }else{
-                await this.$resetdelete('rs/entity/t_attribute', {id: this.riser[i].id}, {warnMsg:null,resolveMsg: null, rejectMsg: null})
-              }
-            }
+      let res = await http.load('post', `rs/entity/t_adjustablebox`, this.model, {resolveMsg: '调压箱保存成功', rejectMsg: '保存失败!!!'})
+      if (this.riser[0]) {
+        for (var i = 0; i < this.riser.length; i++) {
+          var params = {
+            id: this.riser[i].id,
+            f_table_name: `t_adjustablebox`,
+            f_field_name: 'id',
+            f_parent_id: res.data.id,
+            f_value: this.riser[i].f_value,
+            f_chinese_name: '立管编号',
+            f_operator: this.$login.f.name,
+            f_operatorid: this.$login.f.id,
+            f_orgid: this.$login.f.orgid,
+            f_orgname: this.$login.f.orgs,
+            f_depid: this.$login.f.depids,
+            f_depname: this.$login.f.deps
           }
-          if(this.delrow.length>0){
-            for(var i=0;i<this.delrow.length;i++){
-              await this.$resetdelete('rs/entity/t_attribute', {id: this.delrow[i]}, {warnMsg:null,resolveMsg: null, rejectMsg: null})
-            }
+          if (this.riser[i].f_value) {
+            await http.load('post', `rs/entity/t_attribute`, params, {resolveMsg: null, rejectMsg: null})
+          } else {
+            await this.$resetdelete('rs/entity/t_attribute', {id: this.riser[i].id}, {warnMsg: null, resolveMsg: null, rejectMsg: null})
           }
-       this.$dispatch('success', '调压箱保存成功', this.model, res)
-       this.riser=[{}]
-       this.delrow=[]
+        }
+      }
+      if (this.delrow.length > 0) {
+        for (var i = 0; i < this.delrow.length; i++) {
+          await this.$resetdelete('rs/entity/t_attribute', {id: this.delrow[i]}, {warnMsg: null, resolveMsg: null, rejectMsg: null})
+        }
+      }
+      // 操作了调压箱 清空分公司initdata缓存
+      await http.load('POST', 'rs/logic/delSaleInitData', {data: {}}, {resolveMsg: null, rejectMsg: null})
 
+      this.$dispatch('success', '调压箱保存成功', this.model, res)
+      this.riser = [{}]
+      this.delrow = []
     },
-    delriser (index,row) {
+    delriser (index, row) {
       if (this.riser.length > 1) {
         this.riser.splice(index, 1)
-        if(row.id){
+        if (row.id) {
           this.delrow.push(row.id)
         }
       }
@@ -252,7 +254,7 @@ export default {
       this.riser.push({})
     },
     async datatomodel () {
-      this.delrow=[]
+      this.delrow = []
       this.$nextTick(() => {
         if (JSON.stringify(this.data) === '{}') {
           Object.assign(this.$data.model, this.$options.data().model)
@@ -270,13 +272,13 @@ export default {
           this.model.f_operate_date ? this.changedate = false : this.changedate = true
         }
       })
-      if(this.data.id){
-        var data=await this.$resetpost('rs/sql/saleSingleTable', {data: {tablename: 't_attribute', condition: `f_table_name = 't_adjustablebox' and f_parent_id = '${this.data.id}' and f_chinese_name ='立管编号'`}}, {resolveMsg: null, rejectMsg: '获取调压箱失败'})
-        this.riser=data.data
+      if (this.data.id) {
+        var data = await this.$resetpost('rs/sql/saleSingleTable', {data: {tablename: 't_attribute', condition: `f_table_name = 't_adjustablebox' and f_parent_id = '${this.data.id}' and f_chinese_name ='立管编号'`}}, {resolveMsg: null, rejectMsg: '获取调压箱失败'})
+        this.riser = data.data
       }
 
-      if (this.riser.length===0){
-        this.riser=[{}]
+      if (this.riser.length === 0) {
+        this.riser = [{}]
       }
     },
     cancel () {
@@ -305,7 +307,7 @@ export default {
       this.isshow = true
     },
     closeModal () {
-      this.isshow = false;
+      this.isshow = false
     },
     getmylocation (res) {
       this.tempPosition = res
@@ -314,7 +316,7 @@ export default {
       this.model.f_adjustable_address = this.tempPosition.formattedAddress
       this.model.f_adjustable_lng = this.tempPosition.position.lng
       this.model.f_adjustable_lat = this.tempPosition.position.lat
-      this.isshow = false;
+      this.isshow = false
     }
   }
 }

package/src/components/common/userinfo_detail/ic_detail/MeterParam.vue

@@ -41,10 +41,11 @@
               <!--@change="$parent.$parent.$parent.select()" style="width: 22px;height: 22px"/>-->
               <!--</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>
             </tr>
           </template>
           <template partial='body' partial='list' v-ref:grid>
@@ -54,15 +55,24 @@
               <!--:checked="$parent.$parent.$parent.ischecked($parent.model.pageIndex-1,$index)" style="width: 22px;height: 22px;"/>-->
               <!--</td>-->
               <td style="text-align:center"><nobr>{{row.f_type}}</nobr></td>
-              <td style="text-align:center"><nobr>{{row.f_data}}</nobr></td>
+              <!--<td style="text-align:center"><nobr>{{row.f_data}}</nobr></td>-->
               <td style="text-align:center"><nobr>{{row.f_data_date}}</nobr></td>
               <td style="text-align:center"><nobr>{{row.f_data_total}}</nobr></td>
               <td style="text-align:center"><nobr>{{row.f_insert_date}}</nobr></td>
+              <td style="text-align:center"@click="$parent.$parent.$parent.dealmsg(row)" ><button class="btn">查看</button></td>
             </tr>
           </template>
           <template partial='foot'></template>
         </data-grid>
       </criteria-paged>
+      <modal :show.sync="isShowDetailInfo" width="1000px" title="详情展示" v-ref:modal backdrop="false"  >
+        <article slot="modal-body" class="modal-body">
+        <json-parse :data-json="rowData"  :json-fields="jsonFields"></json-parse>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button type="button" class="btn btn-success" @click='cancel'>关闭</button>
+        </footer>
+      </modal>
     </div>
   </div>
 </template>
@@ -85,7 +95,19 @@
         fields: {'f_preamount': '购气金额', 'f_pregas': '购气量', 'f_operate_date': '缴费时间', 'f_operator': '操作员', 'f_comments': '备注'},
         defaultfield: [
           'f_preamount', 'f_pregas', 'f_operate_date', 'f_operator', 'f_comments'
-        ]
+        ],
+        jsonFields: {
+          factoryFlow: '工况流量',
+          dataDate: '记录时间',
+          factoryTotal: '工况累积量',
+          temperature: '温度',
+          standardTotal: '标况累积量',
+          pressure: '压力',
+          standardFlow: '标流量',
+          Result: '结果'
+        },
+        isShowDetailInfo: false,
+        rowData: ''
       }
     },
     props: ['row'],
@@ -93,6 +115,23 @@
       this.$refs.paged.$refs.criteria.search()
     },
     methods: {
+      /**
+       * 退出json详细信息页面
+       */
+      cancel () {
+        this.isShowDetailInfo = false
+      },
+      /**
+       * 展示json
+       * @param obj 传递的row
+       */
+
+      dealmsg (obj) {
+        console.log('==================>', obj)
+        this.isShowDetailInfo = true
+        this.rowData = obj.f_data
+        debugger
+      },
       search () {
         this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_userfiles_id = '${this.row.f_userfiles_id}'`
         this.model.search(this.condition, this.model)

package/src/components/revenue/base/leftview/CheckGas.vue

@@ -39,7 +39,6 @@ export default {
     },
     props: ['data'],
     ready () {
-      debugger
       checkGas(this)
     },
     watch: {

package/src/components/revenue/comprehen/StairPrice/GasPrice.vue

@@ -331,7 +331,7 @@ let initGen = async function (self, val) {
           this.mixshow = true
         } else if (val === '阶梯气价') {
           this.model.detailprice = [{f_gas: '', f_price: '', f_add_gas: 0, f_add_gas_heat: 0}]
-          if (this.model.f_deduction_way == undefined || this.model.f_deduction_way == ''){
+          if (this.model.f_deduction_way == undefined || this.model.f_deduction_way == '') {
             this.model.f_deduction_way = 'cycle'
           }
           this.stairshow = true
@@ -388,9 +388,7 @@ let initGen = async function (self, val) {
             resolveMsg: null,
             rejectMsg: '验证气价出错！！'
           })
-
           console.log('验证气价:', validateResult)
-
           if (validateResult.data.toBeUsePrice.length > 0) {
             // 有待使用气价， 将待使用气价信息展示
             let awaitOper = await this.$showMessage(`此气价存在待使用记录, 将于${validateResult.data.toBeUsePrice[0].f_perform_date} 开始使用！是否将其作废?`, ['confirm', 'cancel'])
@@ -426,6 +424,10 @@ let initGen = async function (self, val) {
         }
         // 现调用气价修改的逻辑   返回：version 和之前的对比 增加的话， 进行提示操作 反之 结束
         await this.$LogicService.gasPrice(this.model, this.data)
+        // 操作了气价 清空分公司initdata缓存
+        let http = new HttpResetClass()
+        await http.load('POST', 'rs/logic/delSaleInitData', {data: {}}, {resolveMsg: null, rejectMsg: null})
+
         this.$dispatch('success', '气价管理', this.data)
         this.initModel()
       },
@@ -437,6 +439,8 @@ let initGen = async function (self, val) {
             resolveMsg: '删除气价成功',
             rejectMsg: '删除气价失败'
           })
+          let http = new HttpResetClass()
+          await http.load('POST', 'rs/logic/delSaleInitData', {data: {}}, {resolveMsg: null, rejectMsg: null})
         }
         this.$dispatch('success')
       },