sale-client 3.5.70 → 3.5.72

package/build/dev-server.js

@@ -1,164 +1,164 @@
-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://121.36.106.17: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
-  },
-  '/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: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://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
+  },
+  '/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.70",
+  "version": "3.5.72",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/revenue/comprehen/Maintenance/otherRecords/specificInformation.vue

@@ -220,8 +220,8 @@
       //   this.typenumberList = this.$appdata.getParam(val)
       // },
       selectoperator () {
-        let f_operator = this.model.operator
-        console.log('处理签的this.f_operatorid', this.f_operatorid)
+        let f_operator = this.model.f_operator
+        console.log('处理签的this.model.f_operatorid', this.model.f_operator)
         let http = new HttpResetClass()
         http.load('POST', 'rs/logic/findOperator',
           {f_operator: f_operator},
@@ -230,10 +230,10 @@
           if(res.data.length>0){
             this.model.f_operatorid = res.data[0].id
           }else{
-            this.model.operator=''
+            this.model.f_operator=''
             this.$showAlert('操作员信息未找到，请在参数管理进行添加','warning',2000)
           }
-            console.log('this.f_operatorid', this.f_operatorid)
+            console.log('this.model.f_operatorid', this.model.f_operatorid)
           })
       },
       editclose () {

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

@@ -32,15 +32,15 @@
           <!--            <label class="font_normal_body"-->
           <!--                   style="text-align:left">{{ param.default_value ? `当前默认值为：${param.default_value}；` : '当前未设置默认值' }}</label>-->
           <!--          </div>-->
-          <div class="col-sm-8" v-if="paramtype==='设置表功能开关'">
+          <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>-->
           </div>
-          <template v-if="paramtype!=='设置表功能开关'">
+          <template v-if="!['设置特殊故障是否关阀','设置表功能开关'].includes(paramtype)">
             <div class="col-sm-8" v-if="param.type!=='option'">
               <input :type="param.type" v-model="row[param.title]"
-                     style="width:70%"  :value.sync="row[param.title]"
+                     style="width:70%" :value.sync="row[param.title]"
                      placeholder="" class="input_search">
             </div>
             <div class="col-sm-8" v-if="param.type==='option'">
@@ -187,7 +187,7 @@ export default {
   title: '参数设置',
   props: ['user', 'checked1', 'gasbrandid', 'condition'],
   components: {RadioBtn},
-  data () {
+  data() {
     return {
       newmeterinfo: [{}],
       row: {},
@@ -199,7 +199,7 @@ export default {
       isenbale: false
     }
   },
-  ready () {
+  ready() {
 
   },
   watch: {
@@ -209,12 +209,12 @@ export default {
       },
       deep: true
     },
-    'gasbrandid' (val) {
+    'gasbrandid'(val) {
       if (val[0]) {
         this.refreshParam(val[0])
       }
     },
-    'paramtype' (val) {
+    'paramtype'(val) {
       this.row = {}
       if (val) {
         // 循环给row赋值  row存储当前页面的值   虽然我不知道为什么这么设计  但是目前只能继续用了
@@ -248,11 +248,11 @@ export default {
     }
   },
   methods: {
-    close () {
+    close() {
       this.row = {}
       this.$dispatch('close')
     },
-    async setParamDefault () {
+    async setParamDefault() {
       let params = []
       for (let i = 0; i < this.newmeterinfo.length; i++) {
         for (let j = 0; j < this.newmeterinfo[i].params.length; j++) {
@@ -266,14 +266,12 @@ export default {
                 data.param_value = this.row[key] ? (this.row[key].code ? this.row[key].code : this.row[key]) : null
                 data.param_content = this.row[key] ? (this.row[key].content ? this.row[key].content : this.row[key]) : null
                 data.param_lname = this.newmeterinfo[i].params[j].title
-                if (this.paramtype === '设置表功能开关') {
-                  if (this.row[key].length === 2 || (this.row[key].length === 1 && this.row[key][0] === '启用')) {
+                if (['设置特殊故障是否关阀', '设置表功能开关'].includes(this.paramtype)) {
+                  if (this.row[key].length === 1 && this.row[key][0] === '启用') {
                     data.param_value = data.param_content = '1'
-                  }
-                  if (this.row[key].length === 0) {
+                    params.push(data)
+                  } else if (this.row[key].length === 0) {
                     data.param_value = data.param_content = '0'
-                  }
-                  if (!(this.row[key].length === 1 && this.row[key][0] === '保持不变')) {
                     params.push(data)
                   }
                 } else if (this.row[key]) {
@@ -301,14 +299,16 @@ export default {
         f_gasbrand_id: this.gasbrandid[0]
       }
       console.log(param)
-      await this.$resetpost('/rs/logic/alteration_batch', {data: param}, {
-        rejectMsg: '批量保存失败',
-        resolveMsg: '保存成功'
-      })
+      if (params.length > 0) {
+        await this.$resetpost('/rs/logic/alteration_batch', {data: param}, {
+          rejectMsg: '批量保存失败',
+          resolveMsg: '保存成功'
+        })
+      }
       this.row = null
       this.$dispatch('clear')
     },
-    async setParam () {
+    async setParam() {
       let user = []
       let filesid = ''
       this.user.forEach((item) => {
@@ -332,15 +332,12 @@ export default {
                 data.param_value = this.row[key] ? (this.row[key].code ? this.row[key].code : this.row[key]) : null
                 data.param_content = this.row[key] ? (this.row[key].content ? this.row[key].content : this.row[key]) : null
                 data.param_lname = this.newmeterinfo[i].params[j].title
-                if (this.paramtype === '设置表功能开关') {
-                  debugger
-                  if (this.row[key].length === 2 || (this.row[key].length === 1 && this.row[key][0] === '启用')) {
+                if (['设置特殊故障是否关阀', '设置表功能开关'].includes(this.paramtype)) {
+                  if (this.row[key].length === 1 && this.row[key][0] === '启用') {
                     data.param_value = data.param_content = '1'
-                  }
-                  if (this.row[key].length === 0) {
+                    params.push(data)
+                  } else if (this.row[key].length === 0) {
                     data.param_value = data.param_content = '0'
-                  }
-                  if (!(this.row[key].length === 1 && this.row[key][0] === '保持不变')) {
                     params.push(data)
                   }
                 } else if (this.row[key]) {
@@ -369,14 +366,16 @@ export default {
         f_gasbrand_id: this.gasbrandid[0]
       }
       console.log(param)
-      await this.$resetpost('/rs/logic/alteration_batch', {data: param}, {
-        rejectMsg: '批量保存失败',
-        resolveMsg: '保存成功'
-      })
+      if (params.length > 0) {
+        await this.$resetpost('/rs/logic/alteration_batch', {data: param}, {
+          rejectMsg: '批量保存失败',
+          resolveMsg: '保存成功'
+        })
+      }
       this.row = null
       this.$dispatch('clear')
     },
-    async refreshParam (val) {
+    async refreshParam(val) {
       this.paramtypes = []
       let temp = {
         tablename: 't_gasbrand',
@@ -420,7 +419,7 @@ export default {
       }
       this.$dispatch('showparam', true)
     },
-    async getBrandParamsHistory () {
+    async getBrandParamsHistory() {
       let http = new HttpResetClass()
       let res = await http.load('POST', 'rs/sql/getBrandParamHistory', {
         data: {

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

@@ -1,6 +1,6 @@
 <template>
-  <label>启用<input type="checkbox" v-model="value"  @click="onChange('启用')"  value="启用"/></label>
-  <label>保持不变<input type="checkbox" v-model="value" @click="onChange('保持不变')"  value="保持不变"/></label>
+  <label>启用<input type="checkbox" v-model="value"  @click="onChange('启用')" :disabled="value.includes('保持不变')"  value="启用"/></label>
+  <label>保持不变<input type="checkbox" v-model="value" @click="onChange('保持不变')" :disabled="value.includes('启用')" value="保持不变"/></label>
 </template>
 
 <script>
@@ -10,7 +10,7 @@ export default {
   props: {
     value: {
       type: Array,
-      default: []
+      default: ['保持不变']
     }
   },
   data () {

package/src/filiale/guangxi/CardChangeFill.vue

@@ -178,6 +178,7 @@
 
   import {HttpResetClass} from 'vue-client'
   import CardService from './CardService'
+  import PrintBill from './PrintBill'
 
 let preamountGen = async function (self) {
     let calFee = (self.model.f_totalcost - 0) + (self.model.f_fill_money - 0)
@@ -329,6 +330,7 @@ let preamountGen = async function (self) {
 
   export default {
     title: '换表补气',
+    component: {PrintBill},
     data () {
       return {
         config: {

package/src/filiale/guangxi/CardMeterChargeCancel.vue

@@ -154,6 +154,7 @@ let cardChargeCancelGen = async function (self) {
   self.row.cardInfo = self.cardData
   self.model = Object.assign({}, self.model, self.correctModel)
   let res = null
+  debugger
   if (self.xmodel.id) {
     res = await CardService.cardAndFillGasCancel(self.model, self.xmodel, self.row)
   } else {

package/src/filiale/guangxi/CardService.js

@@ -401,6 +401,7 @@ let sellCancelGen = async function (model, row) {
       if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
         await rollbackGen(result, model, row)
       } else {
+        await modify(row.f_userfiles_id, '0', '2')
         Vue.showAlert('撤销成功', 'success', 2000)
         return result
       }