sale-client 3.5.83 → 3.5.84-ct

package/build/dev-server.js

@@ -1,167 +1,167 @@
-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://127.0.0.1:5001'
-// 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/logic/getWarningMsg': {
-    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: 'http://127.0.0.1:8080'
-  }
-}
-
-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
+  },
+  '/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.83",
+  "version": "3.5.84-ct",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -17,7 +17,6 @@
     "url": "https://gitee.com/aote/product.git"
   },
   "dependencies": {
-    "crypto-js": "^4.1.1",
     "examples": "^0.1.0",
     "js-file-download": "0.4.12",
     "less-loader": "^2.2.3",

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -359,9 +359,12 @@ export default {
           this.fileSaveData.userinfo.f_operatorid = nameId
           this.fileSaveData.userinfo.f_depname = parentname
           this.fileSaveData.userinfo.f_depid = parentnameId
+          this.fileSaveData.userinfo.userfiles.f_operator = name
+          this.fileSaveData.userinfo.userfiles.f_operatorid = nameId
+          this.fileSaveData.userinfo.userfiles.f_depname = parentname
+          this.fileSaveData.userinfo.userfiles.f_depid = parentnameId
         }
       }
-
       this.$FileManageService.fileSave(this.fileSaveData).then((res) => {
         this.$parent.resdata = res.data.result[0].f_userinfo_code
         if (!this.row) {

package/src/components/chargeBatch/BatchCharge.vue

@@ -95,6 +95,8 @@
 </template>
 
 <script>
+import {HttpResetClass} from "vue-client";
+
 let asyncMachineMeterCenter = async function (self) {
   await self.$getConfig(self, 'BatchCharge')
   self.data.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
@@ -108,6 +110,9 @@ export default {
   title: '团体缴费',
   data () {
     return {
+      // 请求对象(批量导入,查询进度使用)
+      HttpReset: new HttpResetClass(),
+      timer: null,
       config: {
         showupload: true, // 显示上传
         hasPrint: true,  // 默认打票
@@ -131,6 +136,10 @@ export default {
     }
   },
   props: ['data', 'owe', 'civill'],
+  beforeDestroy () {
+    // 销毁定时器
+    if (this.timer) clearInterval(this.timer)
+  },
   ready () {
     this.paycodefocus()
     if (!this.$login.r.includes('免交充值付款')) {
@@ -218,7 +227,9 @@ export default {
       })
     },
     async machineChargeGen () {
+      let uuid = this.$login.guid()
       let param = {
+        uuid: uuid,
         chargeUser: [],
         f_serial_id: this.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no,
         f_balance: this.data.f_balance,
@@ -248,29 +259,45 @@ export default {
       if (this.civill) {
         param = Object.assign(this.civill, param)
       }
-      let res = await this.$resetpost('rs/logic/batchPayment', {data: param}, {resolveMsg: '团体收费成功', rejectMsg: '团体收费失败'})
-      if (this.config.hasPrint) {
-        if (this.data.f_print.indexOf('电子发票') == -1) {
-          console.log('this.config.hasBillManage', this.config.hasBillManage)
-          if (this.config.hasBillManage) {
-              // 启用发票管理，获取票据管理中的票号并存储记录
-            this.row.id = res.data.id
-            this.row.f_bill_type = '物联网收费'
-            this.row.f_bill_style = this.model.f_print[0]
-            this.print = true
+      try {
+        await this.$resetpost('rs/logic/batchPayment', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
+      } catch (e) {}
+      this.$showMessage(`正在批量处理中, 请耐心等待...`, [])
+      // 启动定时器定时查询处理结果
+      this.timer = setInterval(async () => {
+        let res = await this.HttpReset.load('POST', 'rs/logic/getBatchOperaPro', {data: {uuid: uuid}}, {resolveMsg: null, rejectMsg: null})
+        if (res.data.msg || res.data.error) {
+          clearInterval(this.timer)
+          this.$closeMessage()
+          if (res.data.error) {
+            this.$showAlert(`${res.data.error}`, 'danger')
+            return
+          }
+          await this.$showMessage(res.data.msg)
+          if (this.config.hasPrint) {
+            if (this.data.f_print.indexOf('电子发票') == -1) {
+              console.log('this.config.hasBillManage', this.config.hasBillManage)
+              if (this.config.hasBillManage) {
+                // 启用发票管理，获取票据管理中的票号并存储记录
+                this.row.id = res.data.id
+                this.row.f_bill_type = '物联网收费'
+                this.row.f_bill_style = this.model.f_print[0]
+                this.print = true
+              } else {
+                this.data.id = res.data.id
+                this.print = true
+              }
+            } else if (this.config.printType === '国税发票') {
+              // TODO
+            } else if (this.model.f_print[0] === '电子发票') {
+              this.eticket_show = true
+              await this.$refs.eticketbill.openETicket([res.data.id], this.row, this.invoice_show_gas, this.invoice_is_pax, '物联网收费')
+            }
           } else {
-            this.data.id = res.data.id
-            this.print = true
+            this.clean()
           }
-        } else if (this.config.printType === '国税发票') {
-            // TODO
-        } else if (this.model.f_print[0] === '电子发票') {
-          this.eticket_show = true
-          await this.$refs.eticketbill.openETicket([res.data.id], this.row, this.invoice_show_gas, this.invoice_is_pax, '物联网收费')
         }
-      } else {
-        this.clean()
-      }
+      }, 5000)
     },
     clean () {
       this.$dispatch('success')

package/src/components/revenue/comprehen/Maintenance/hand/handListMaintain.vue

@@ -46,7 +46,7 @@
                 <div class="span" style="float:right;">
                   <button class="button_spacing button_search" title="批量维护抄表记录" :disabled="!this.$login.r.includes('批量维护抄表记录')" @click="$parent.$parent.updateAll()">批量维护</button>
                   <button class="button_search" @click="search()">查 询</button>
-                  <export-excel :data="{condition: $parent.$parent.condition}"
+                  <export-excel :data="{condition: $parent.$parent.condition,condValue: $parent.$parent.condValueStr}"
                                 :field="$parent.$parent.getfield"
                                 sqlurl="rs/logic/saleExport" sql-name="handFiles"
                                 template-name='抄表记录'
@@ -376,7 +376,8 @@ const myMap = new Map()
         ],
         meterType: [{label: '金额卡表', value: '金额卡表'}, {label: '气量卡表', value: '气量卡表'}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
         inputtores: [{label: '全部', value: ''}],
-        orgCondtionStr: ''
+        orgCondtionStr: '',
+        condValueStr: ''
       }
     },
     async ready () {
@@ -562,6 +563,7 @@ const myMap = new Map()
         args.condValueStr = `${args.condValueStr} ` + f_orgstr
         this.model.search(args.condition, args.model, args.condValueStr)
         this.condition = args.condition
+        this.condValueStr = args.condValueStr
       }
     },
     watch: {

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

@@ -76,6 +76,14 @@
                         close-on-select v-ref:type>
               </v-select>
             </div>
+            <div :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">气价状态</label>
+              <v-select :value.sync="model.f_price_state" v-model="model.f_price_state"
+                        placeholder='气价状态' :options="$parent.$parent.price_states"
+                        condition="f_price_state = '{}'"
+                        close-on-select v-ref:type>
+              </v-select>
+            </div>
           </div>
         </div>
 
@@ -136,7 +144,7 @@
             <td style="text-align:center"><nobr>{{row.f_value}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_filiale_name}}</nobr></td>
             <td style="text-align:center"><button @click.stop="$parent.$parent.$parent.operate(row.f_price_id,row.f_price_name,row.f_filialeid)" class="btn btn-link"><b>{{row.usercount}}</b></button></td>
-            <td style="text-align:center">{{row.f_state === '待审核' ? '待审核' : '使用中'}}</td>
+            <td style="text-align:center">{{row.f_price_state}}</td>
             <td style="text-align:center" v-if="$parent.$parent.$parent.config.audit">
               <button :disabled="$login.r.includes('气价审核')" @click.stop="$parent.$parent.$parent.passPrice(row)"
                       class="btn btn-link" v-if="row.f_state === '待审核'">通过
@@ -198,6 +206,7 @@
         f_orgid: '',
         gasproperties: [],
         custom: [{label: '全部', value: ''}, {label: '正常气价', value: '正常气价'}, {label: '自定义气价', value: '自定义气价'}],
+        price_states: [{label: '全部', value: ''}, {label: '使用中', value: '使用中'}, {label: '删除', value: '删除'}, {label: '已作废', value: '已作废'}],
         usertypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : []
       }
     },
@@ -215,13 +224,14 @@
     },
     ready () {
       this.$refs.paged.$refs.cri.model.performDate = this.$login.toStandardDateString()
+      this.$refs.paged.$refs.cri.model.f_price_state = '使用中'
       this.search()
     },
     methods: {
-      batchAdjust(){
-        this.$parent.usershow=true
-        this.$parent.priceid=null
-        this.$parent.priceorgid=null
+      batchAdjust () {
+        this.$parent.usershow = true
+        this.$parent.priceid = null
+        this.$parent.priceorgid = null
       },
       showhistory (row) {
         this.show = true

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

@@ -52,6 +52,15 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-2" >
+              <label class="font_normal_body">组织机构</label>
+              <res-select :initresid='$parent.$parent.curorgid'
+                          @res-select="$parent.$parent.getorg"
+                          class="select select_list"
+                          restype='organization'
+                          style="width: 60%">
+              </res-select>
+            </div>
             <div class="col-sm-2 ">
               <label class="font_normal_body">表&emsp;号&emsp;</label>
               <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
@@ -259,6 +268,8 @@ export default {
       user: [],
       meterbrand: [],
       meterstyle: {},
+      curorgid: [this.$login.f.orgid],
+      f_orgid: '',
       model: new PagedList('rs/sql/iot_getOpertionList', 20),
       searchshow: false,
       showParame: false,
@@ -321,6 +332,9 @@ export default {
     // this.model.search('1=1')
   },
   methods: {
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+    },
     //    let condition = 'f_meter_type = "物联网表"'
     // this.$resetpost('/rs/sql/getAllBrands',{data:{condition:condition}},{}).then((res)=>{
     //   let arr=[]
@@ -415,11 +429,15 @@ export default {
       this.search()
     },
     selfSearch (args) {
-      args.condition = `${args.condition} `
+      if (this.f_orgid) {
+        args.condition = `f_orgid in ${this.f_orgid} and ${args.condition}`
+      }
       if (this.f_gasbrand_id.length > 0) {
         args.condition += ' and f_gasbrand_id=' + this.f_gasbrand_id[0]
         this.condition = args.condition
         this.model.search(args.condition, args.model)
+      } else {
+        this.$showAlert(`请先选择气表品牌`, 'warning', 0)
       }
       // this.isCheckAll = false
     },