sale-client 3.5.21 → 3.5.22

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: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.21",
+  "version": "3.5.22",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/FilesManage/FileUserFiles.vue

@@ -42,6 +42,7 @@
                           class="form-group button-range">
                     <!--<button class="button_search button_spacing" style="width: 90px" @click="$parent.$parent.showFileInfo()">查看批量状态-->
                     <!--</button>-->
+                    <button class="button_search button_spacing" type="button" @click="$parent.$parent.goChargeManage()">去收费</button>
 
                     <button @click="search(), $parent.$parent.clean()" class="button_search button_spacing"
                             style="float: right">查询

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

@@ -317,7 +317,9 @@
         uuidA = s.join('');
         return uuidA;
       },
-      goChargeManage () {
+      async goChargeManage () {
+        await this.$copyText(this.row.f_userinfo_code)
+        this.$showAlert(`用户编号已复制到剪切板！`, 'success', 2000)
         this.$goto('charge-manage', {f: this.$login.f}, 'main')
       },
       openUser () {

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

@@ -15,7 +15,7 @@
                                :value.sync="model.f_startDate"
                                :format="'yyyy-MM-dd HH:mm:ss'"
                                class="datepicker"
-                               condition="f_input_date >= '{}'"
+                               cond-value="h.f_input_date >= '{}'"
                                :show-reset-button="true"
                                class="select"
                   >
@@ -28,7 +28,7 @@
                                :value.sync="model.f_endDate"
                                :format="'yyyy-MM-dd HH:mm:ss'"
                                class="datepicker"
-                               condition="f_input_date <= '{}'"
+                               cond-value="h.f_input_date <= '{}'"
                                :show-reset-button="true"
                   >
                   </datepicker>
@@ -36,7 +36,7 @@
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户编号</label>
                   <input type="text" class="input_search"  style="width: 60%" v-model="model.f_userinfo_code"
-                         condition="f_userinfo_code = '{}'" placeholder='客户编号'>
+                         cond-value="h.f_userinfo_code = '{}'" placeholder='客户编号'>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户姓名</label>
@@ -62,7 +62,7 @@
                   <label class="font_normal_body" for="f_meter_classify">气表类型</label>
                   <v-select :options='$parent.$parent.meterType'
                             :value.sync="model.f_meter_classify"
-                            close-on-select condition="f_meter_classify = '{}'"
+                            close-on-select cond-value="h.f_meter_classify = '{}'"
                             placeholder='气表类型' value-single="true"
                             style="width: 60%"  v-model="model.f_meter_classify"></v-select>
                 </div>
@@ -71,7 +71,7 @@
                   <v-select :value.sync="model.f_gasbrand"
                             :options='$parent.$parent.getMeterBrands(model.f_meter_classify)'
                             placeholder='气表品牌' close-on-select
-                            condition="f_meter_brand = '{}'"
+                            cond-value="h.f_meter_brand = '{}'"
                             search v-model='model.f_gasbrand' v-ref:brand></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -113,7 +113,7 @@
                   <label class="font_normal_body">抄&ensp;表&ensp;员</label>
                   <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'
                             style="width:60%"
-                            condition="f_inputtor = '{}'"
+                            cond-value="h.f_inputtor = '{}'"
                             :options='$parent.$parent.inputtores' placeholder='抄表员'
                             close-on-select
                             v-el:cc></v-select>
@@ -141,7 +141,7 @@
                   <v-select :value.sync="model.f_hand_state"
                             :options='$parent.$parent.handstate'
                             placeholder='状态' close-on-select
-                            condition="f_hand_state = '{}'"
+                            cond-value="h.f_hand_state = '{}'"
                             search v-model='model.f_hand_state' v-ref:brand></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -158,7 +158,7 @@
                             v-model="model.f_meter_state"
                             :value-single="true"
                             :options='$parent.$parent.meterstate'
-                            placeholder='抄表状态' condition="f_meter_state = '{}'"
+                            placeholder='抄表状态' cond-value="h.f_meter_state = '{}'"
                             close-on-select ></v-select>
                 </div>
 
@@ -318,7 +318,7 @@ const myMap = new Map()
         da: {
           rows: []
         },
-        baseSource:[{label: '全部', value: ''}, {label: '手动录入', value: " (f_tablebase_source='手动录入' or f_tablebase_source is null)"},{label: '自动识别', value: "f_tablebase_source ='自动识别'"}],
+        baseSource: [{label: '全部', value: ''}, {label: '手动录入', value: " (f_tablebase_source='手动录入' or f_tablebase_source is null)"}, {label: '自动识别', value: "f_tablebase_source ='自动识别'"}],
         f_meternumber: '',
         splitdata: '',
         // 公司下拉
@@ -332,10 +332,10 @@ const myMap = new Map()
         f_orgid: '',
         checked1: true,
         map: new Map(),
-        updateall:false,
-        updatemodel:{
+        updateall: false,
+        updatemodel: {
           f_accounting_date: null,
-          f_start_date:null
+          f_start_date: null
         },
         priceSplit: false,
         criteriaShow: false,
@@ -390,7 +390,7 @@ const myMap = new Map()
     },
     props: ['showMessage'],
     methods: {
-      updateAll(){
+      updateAll () {
         this.updateall = true
       },
       checkedALL () {
@@ -415,46 +415,45 @@ const myMap = new Map()
           this.map.set(id, {id: id})
         }
       },
-      cancel(){
+      cancel () {
         this.updateall = false
         this.updatemodel = {
           f_accounting_date: null,
           f_start_date: null
         }
       },
-      async confirm(){
+      async confirm () {
         let array = []
         this.map.forEach((value, key, map) => {
           array.push(map.get(key))
         })
-        console.log('asdasd',array)
-        if (array.length>0){
+        console.log('asdasd', array)
+        if (array.length > 0) {
           let condition = `id in (''`
           array.forEach((row) => {
-            condition = condition+`,'${row.id}'`
+            condition = condition + `,'${row.id}'`
           })
-          condition = condition+ `)`
+          condition = condition + `)`
 
-          console.log('asdasd',condition)
-          let param={}
-          if(this.updatemodel.f_start_date){
-            param.f_start_date=this.updatemodel.f_start_date
+          console.log('asdasd', condition)
+          let param = {}
+          if (this.updatemodel.f_start_date) {
+            param.f_start_date = this.updatemodel.f_start_date
           }
-          if(this.updatemodel.f_accounting_date){
-            param.f_accounting_date=this.updatemodel.f_accounting_date
+          if (this.updatemodel.f_accounting_date) {
+            param.f_accounting_date = this.updatemodel.f_accounting_date
           }
-          await this.$resetpost('rs/logic/updatehandplan',{updatemodel:param,condition:condition})
+          await this.$resetpost('rs/logic/updatehandplan', {updatemodel: param, condition: condition})
           this.search()
           this.cancel()
-        } else{
+        } else {
           this.$showMessage('当前未勾选用户，将为所有查询出来的用户进行批量修改，确定要操作吗？', ['confirm', 'cancel']).then(async (res) => {
             if (res === 'confirm') {
-              await this.$resetpost('rs/logic/updatehandplan',{updatemodel:param,condition:this.condition})
+              await this.$resetpost('rs/logic/updatehandplan', {updatemodel: param, condition: this.condition})
               this.search()
               this.cancel()
             }
           })
-
         }
       },
       async updateParams () {

package/src/filiale/dongguan/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -317,7 +317,9 @@
         uuidA = s.join('');
         return uuidA;
       },
-      goChargeManage () {
+      async goChargeManage () {
+        await this.$copyText(this.row.f_userinfo_code)
+        this.$showAlert(`用户编号已复制到剪切板！`, 'success', 2000)
         this.$goto('charge-manage', {f: this.$login.f}, 'main')
       },
       openUser () {

package/src/filiale/shaoguan/handListMaintain.vue

@@ -14,7 +14,7 @@
                                :value.sync="model.f_startDate"
                                :format="'yyyy-MM-dd HH:mm:ss'"
                                class="datepicker"
-                               condition="f_input_date >= '{}'"
+                               cond-value="h.f_input_date >= '{}'"
                                :show-reset-button="true"
                                class="select"
                   >
@@ -27,7 +27,7 @@
                                :value.sync="model.f_endDate"
                                :format="'yyyy-MM-dd HH:mm:ss'"
                                class="datepicker"
-                               condition="f_input_date <= '{}'"
+                               cond-value="h.f_input_date <= '{}'"
                                :show-reset-button="true"
                   >
                   </datepicker>
@@ -35,7 +35,7 @@
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户编号</label>
                   <input type="text" class="input_search"  style="width: 60%" v-model="model.f_userinfo_code"
-                         condition="f_userinfo_code = '{}'" placeholder='客户编号'>
+                         cond-value="h.f_userinfo_code = '{}'" placeholder='客户编号'>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户姓名</label>
@@ -60,7 +60,7 @@
                   <label class="font_normal_body" for="f_meter_classify">气表类型</label>
                   <v-select :options='$parent.$parent.meterType'
                             :value.sync="model.f_meter_classify"
-                            close-on-select condition="f_meter_classify = '{}'"
+                            close-on-select cond-value="h.f_meter_classify = '{}'"
                             placeholder='气表类型' value-single="true"
                             style="width: 60%"  v-model="model.f_meter_classify"></v-select>
                 </div>
@@ -69,7 +69,7 @@
                   <v-select :value.sync="model.f_gasbrand"
                             :options='$parent.$parent.getMeterBrands(model.f_meter_classify)'
                             placeholder='气表品牌' close-on-select
-                            condition="f_meter_brand = '{}'"
+                            cond-value="h.f_meter_brand = '{}'"
                             search v-model='model.f_gasbrand' v-ref:brand></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -111,7 +111,7 @@
                   <label class="font_normal_body">抄&ensp;表&ensp;员</label>
                   <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'
                             style="width:60%"
-                            condition="f_inputtor = '{}'"
+                            cond-value="h.f_inputtor = '{}'"
                             :options='$parent.$parent.inputtores' placeholder='抄表员'
                             close-on-select
                             v-el:cc></v-select>
@@ -139,7 +139,7 @@
                   <v-select :value.sync="model.f_hand_state"
                             :options='$parent.$parent.street'
                             placeholder='状态' close-on-select
-                            condition="f_hand_state = '{}'"
+                            cond-value="h.f_hand_state = '{}'"
                             search v-model='model.f_hand_state' v-ref:brand></v-select>
                 </div>
                 <div class="col-sm-2">
@@ -148,7 +148,7 @@
                             v-model="model.f_meter_state"
                             :value-single="true"
                             :options='$parent.$parent.meterstate'
-                            placeholder='抄表状态' condition="f_meter_state = '{}'"
+                            placeholder='抄表状态' cond-value="h.f_meter_state = '{}'"
                             close-on-select ></v-select>
                 </div>
                 <res-select-group  :show-component="['company']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
@@ -423,9 +423,9 @@ const myMap = new Map()
         if (!this.f_orgid) {
           this.f_orgid = this.$login.f.orgid
         }
-        let f_orgstr = this.orgCondtionStr ? this.orgCondtionStr : "and f_orgid in ('" + this.f_orgid + "')"
-        args.condition = `${args.condition} ` + f_orgstr
-        this.model.search(args.condition, args.model)
+        let f_orgstr = this.orgCondtionStr ? this.orgCondtionStr : "and h.f_orgid in ('" + this.f_orgid + "')"
+        args.condValueStr = `${args.condValueStr} ` + f_orgstr
+        this.model.search(args.condition, args.model, args.condValueStr)
         this.condition = args.condition
       },
       mergeRowData (joinrows) {