sale-client 3.4.178 → 3.4.179-mc

package/build/dev-server.js

@@ -1,161 +1,160 @@
-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 = 'https://qnjtkf.cn:8400',bendi1 = 'https://qnjtkf.cn:8400'
-// 公司测试服务
-var fuwu = 'https://qnjtkf.cn: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'
-    target: fuwu
-  },
-  '/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')
-})
+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://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: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.4.178",
+  "version": "3.4.179-mc",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -87,7 +87,7 @@
     "style-loader": "^0.20.3",
     "system-clients": "3.2.0-2",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.49",
+    "vue-client": "1.24.51",
     "vue-clipboard2": "0.3.1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",

package/src/components/FilesManage/FileUserFiles.vue

@@ -683,7 +683,7 @@ let loadParamGem = async function (self) {
         this.isedit = false
         this.row = null
         this.areainfo = null
-        this.$refs.info.clearinfo()
+        // this.$refs.info.clearinfo()
       },
       renew () {
         this.row = null

package/src/components/FilesManage/MeterinfoTest.vue

@@ -101,7 +101,7 @@
           </div>
           <div class="col-sm-4 form-group" v-show="row.gasbrand.length > 0 && row.gasbrand[0].f_meter_type == '物联网表' && row.gasbrand[0].f_hascard == '是'">
             <label class="font_normal_body" title="开户方式">开户方式</label>
-            <v-select :value.sync="row.f_open_way" :options='openWay' value-single placeholder='开户方式' close-on-select v-if="row.f_userfiles_id"
+            <v-select :value.sync="row.f_open_way" :options='openWay' value-single placeholder='开户方式' close-on-select v-if="row.f_userfiles_id && row.f_open_way"
                       search v-model='row.f_open_way' :disabled="true"></v-select>
             <v-select :value.sync="row.f_open_way" :options='openWay' value-single placeholder='开户方式' close-on-select v-else
                       search v-model='row.f_open_way' :disabled="false"></v-select>

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -82,9 +82,9 @@
         <div class="row">
           <div class="col-sm-12 form-group" >
             <label for="f_paper_account" class="col-sm-2 font_normal_body " title="参数:变更原因">变更原因:</label>
-            <v-select v-model="reason" style="width:60%"
+            <v-select v-model="fileSaveData.reason" style="width:60%"
                       placeholder='变更原因'
-                      :value.sync="reason"
+                      :value.sync="fileSaveData.reason"
                       :options='reasons'
                       :value-single="true"
                       v-ref:reason
@@ -93,12 +93,12 @@
         </div>
         <div class="row">
           <div class="col-sm-2"></div>
-          <input v-if="reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
+          <input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">
         <button type="button" class="btn btn-default" @click='filechangeDetailsShow = false'>取消</button>
-        <button type="button" class="btn btn-success" :disabled="!fileSaveData.modifyReason" @click='confirmation()'>确认</button>
+        <button type="button" class="btn btn-success" :disabled="!fileSaveData.reason || (fileSaveData.reason === '其他' && !fileSaveData.modifyReason)" @click='confirmation()'>确认</button>
       </footer>
     </modal>
   </div>
@@ -117,11 +117,11 @@ let getFileGen = async function (self, data) {
     rejectMsg: '用户详细信息加载失败，请重新选择，如果多次失败，请检查系统是否正常！'
   })
   self.data = result.data
-  self.data.meterinfo.forEach((item)=>{
-    item.devicesinfo.forEach((item2)=>{
-      if(item2.img.content){
-        let URL = item2.img.content.substring(item2.img.content.lastIndexOf(':\\') +2)
-        item2.img.content = 'http://' + location.host + '/' +  URL
+  self.data.meterinfo.forEach((item) => {
+    item.devicesinfo.forEach((item2) => {
+      if (item2.img.content) {
+        let URL = item2.img.content.substring(item2.img.content.lastIndexOf(':\\') + 2)
+        item2.img.content = 'http://' + location.host + '/' + URL
       }
     })
   })
@@ -170,11 +170,11 @@ export default {
           fireinfo: {}
         }],
         devicesinfo: [],
-        fireinfo:{},
+        fireinfo: {},
         address: {
           id: '',
           f_address: '',
-          f_address_state:''
+          f_address_state: ''
         }
       },
       show_userinfodevices: false,
@@ -202,7 +202,8 @@ export default {
       defaultMeterInfo: '',  // 默认的表具信息
       fileSaveData: {
         // 修改原因
-        modifyReason: ''
+        modifyReason: '',
+        reason: ''
       },
       // 档案变更明细
       filechangeDetails: {rows: []},
@@ -243,7 +244,7 @@ export default {
   },
   methods: {
     async getOvedueset () {
-      let overdueset= []
+      let overdueset = []
       let res = await this.$resetpost('rs/sql/saleSingleTable', {
         data: {
           tablename: 't_overdue_set',
@@ -280,7 +281,7 @@ export default {
       this.$resetpost('rs/logic/openBankAccount', {f_userinfo_code: this.data.baseinfo.base.f_userinfo_code, f_username: this.data.baseinfo.base.f_user_name},
         {resolveMsg: null, rejectMsg: null}).then((res) => {
           this.$showMessage(res.data.resultmessage)
-      })
+        })
     },
     async confirm () {
       this.data.addressinfo.f_address = this.$refs.useressential.addressinfo.f_address
@@ -297,7 +298,7 @@ export default {
         this.data.baseinfo.base.version = this.row.version
       }
       console.log('档案保存之前，。。。', this.data)
-      if(this.data.meterinfo[0].f_gas_date != null){
+      if (this.data.meterinfo[0].f_gas_date != null) {
         this.data.addressinfo.f_address_state = '已通气'
       }
       // 获取保存数据
@@ -325,6 +326,9 @@ export default {
       //     return
       //   }
       // }
+      if (this.fileSaveData.reason && this.fileSaveData.reason !== '其他') {
+        this.fileSaveData.modifyReason = this.fileSaveData.reason
+      }
       this.$FileManageService.fileSave(this.fileSaveData).then((res) => {
         this.$parent.resdata = res.data.result[0].f_userinfo_code
         if (!this.row) {
@@ -515,16 +519,16 @@ export default {
                   // 用户电话
             f_user_phone: '',
             f_people_num: 0,
-            f_packaging:'',
+            f_packaging: '',
                   // 备用电话
             f_rent_phone: '',
             f_credentials: '身份证',
             f_cost_type: '',
-            f_bz_type:'',
+            f_bz_type: '',
             f_address: '',
             addressid: '',
             f_idnumber: '',
-            f_meter_book_num:''
+            f_meter_book_num: ''
           },
           bank: {}
         },
@@ -572,8 +576,8 @@ export default {
           f_detailprice: '',  // 价格详情显示
           devicesinfo: [], // 设备信息
           f_hand_month: '', // 抄表月份
-          fireinfo:{}, //用气信息
-          f_meter_book_num:''
+          fireinfo: {}, // 用气信息
+          f_meter_book_num: ''
         }],
         devicesinfo: []
       }
@@ -606,6 +610,9 @@ export default {
     meterbrands () {
       return this.$GetSaleParam.getGasbrand()
     },
+    reasons () {
+      return this.$appdata.getParam('变更原因')
+    },
     adjustables () {
       return this.$GetSaleParam.getAdjustable()
     },