sale-client 3.5.291 → 3.5.293

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [localUrl, serverRul] = ['https://qnjtkf.cn:7400/#', 'https://qnjtkf.cn:7400/#']
+const [localUrl, serverRul] = ['http://121.36.60.63:8800/', 'http://121.36.60.63:8800/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.291",
+  "version": "3.5.293",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/Util.js

@@ -359,3 +359,7 @@ export function nextMonth20 (date) {
 // }
 //
 // export var f;
+// 去除多余的空格和回车
+export function removerUnnecessary (val) {
+  return val.trim().replace(/\s/g, '')
+}

package/src/components/FilesManage/MeterinfoTest.vue

@@ -100,20 +100,13 @@
             <v-select :value.sync="row.f_valve_state" :options='valvestate' placeholder='阀门状态' close-on-select
                       v-model='row.f_valve_state'></v-select>
           </div>
-          <div class="col-sm-4 form-group" :class="[$m.way.required ? 'has-error' : '']" v-show="row.gasbrand.length > 0 && row.gasbrand[0].f_meter_type == '物联网表' && row.gasbrand[0].f_hascard == '是'">
-            <label for="f_open_way" class="font_normal_body">开户方式</label>
-            <v-select :value.sync="row.f_open_way" v-model='row.f_open_way'
-                      placeholder='开户方式' :options='openWay'
-                      close-on-select :disabled="false" v-ref:way></v-select>
-            <input type="text" v-show="false" v-model="$refs.way.selectedItems" v-validate:way='{required: true }'>
-          </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"-->
-<!--                      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>-->
-<!--          </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"
+                      search v-model='row.f_open_way' :disabled="curuser.f_user_state != '预备'"></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>
+          </div>
           <div class="col-sm-4 form-group" v-show="row.gasbrand.length > 0 && row.gasbrand[0].f_meter_brand.indexOf('集中器') !== -1">
             <label class="font_normal_body" title="集中器">集&ensp;中&ensp;器</label>
             <v-select :value.sync="row.f_concentrator_id" :options='concentrators' value-single placeholder='集中器' close-on-select v-if="row.f_userfiles_id"

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -108,6 +108,7 @@
 <script>
 import UserPaperInfoTest from './UserPaperInfoTest'
 import {HttpResetClass} from 'vue-client'
+import * as Util from '../../Util'
 
 let getFileGen = async function (self, data) {
   let http = new HttpResetClass()
@@ -316,6 +317,11 @@ export default {
       }
       this.seaching = true
       console.log('档案保存之前，。。。', this.data)
+      this.data.baseinfo.base.f_user_name = Util.removerUnnecessary(this.data.baseinfo.base.f_user_name)
+      this.data.baseinfo.base.f_user_phone = Util.removerUnnecessary(this.data.baseinfo.base.f_user_phone)
+      this.data.meterinfo.forEach((item) => {
+        item.f_meternumber = Util.removerUnnecessary(item.f_meternumber)
+      })
       if (this.data.meterinfo[0].f_gas_date != null) {
         this.data.addressinfo.f_address_state = '已通气'
       }

package/src/components/FilesManageNew/UserGeneralInfoTest.vue

@@ -70,6 +70,7 @@
 <script>
 import UserPaperInfoTest from './UserPaperInfoTest'
 import {HttpResetClass} from 'vue-client'
+import * as Util from '../../Util'
 
 let getFileGen = async function (self, data) {
   let http = new HttpResetClass()
@@ -311,6 +312,14 @@ export default {
       if (this.row) {
         this.data.baseinfo.base.version = this.row.version
       }
+
+      console.log('档案保存之前，。。。', this.data)
+      this.data.baseinfo.base.f_user_name = Util.removerUnnecessary(this.data.baseinfo.base.f_user_name)
+      this.data.baseinfo.base.f_user_phone = Util.removerUnnecessary(this.data.baseinfo.base.f_user_phone)
+      this.data.meterinfo.forEach((item) => {
+        item.f_meternumber = Util.removerUnnecessary(item.f_meternumber)
+      })
+
       this.$FileManageService.fileSave(this.$FileManageService.fileSaveBefore(this.data)).then((res) => {
         this.savePrintSheet(res.data.result[0])
         this.$dispatch('success')

package/src/filiale/chengtou/components/FilesManage/UserGeneralInfoTest.vue

@@ -109,6 +109,7 @@
 import UserPaperInfoTest from '../../../../components/FilesManage/UserPaperInfoTest'
 import {HttpResetClass} from 'vue-client'
 import FileManageService from '../../plugins/FileManageService'
+import * as Util from '../../../../Util'
 
 let getFileGen = async function (self, data) {
   let http = new HttpResetClass()
@@ -305,6 +306,11 @@ export default {
       }
       this.seaching = true
       console.log('档案保存之前，。。。', this.data)
+      this.data.baseinfo.base.f_user_name = Util.removerUnnecessary(this.data.baseinfo.base.f_user_name)
+      this.data.baseinfo.base.f_user_phone = Util.removerUnnecessary(this.data.baseinfo.base.f_user_phone)
+      this.data.meterinfo.forEach((item) => {
+        item.f_meternumber = Util.removerUnnecessary(item.f_meternumber)
+      })
       if (this.data.meterinfo[0].f_gas_date != null) {
         this.data.addressinfo.f_address_state = '已通气'
       }

package/src/filiale/fugu/components/FilesManage/UserGeneralInfoTest.vue

@@ -110,6 +110,7 @@ import UserPaperInfoTest from "../../../../components/FilesManage/UserPaperInfoT
 import FileManageService from "../plugins/FileManageService";
 
 import {HttpResetClass} from 'vue-client';
+import * as Util from '../../../../Util'
 
 let getFileGen = async function (self, data) {
   let http = new HttpResetClass()
@@ -313,6 +314,11 @@ export default {
       }
       this.seaching = true
       console.log('档案保存之前，。。。', this.data)
+      this.data.baseinfo.base.f_user_name = Util.removerUnnecessary(this.data.baseinfo.base.f_user_name)
+      this.data.baseinfo.base.f_user_phone = Util.removerUnnecessary(this.data.baseinfo.base.f_user_phone)
+      this.data.meterinfo.forEach((item) => {
+        item.f_meternumber = Util.removerUnnecessary(item.f_meternumber)
+      })
       if (this.data.meterinfo[0].f_gas_date != null) {
         this.data.addressinfo.f_address_state = '已通气'
       }

package/src/filiale/gehua/UserGeneralInfoTest.vue

@@ -69,6 +69,7 @@
 <script>
 import UserPaperInfoTest from '../../components/FilesManageNew/UserPaperInfoTest.vue'
 import {HttpResetClass} from 'vue-client'
+import * as Util from '../../Util'
 
 let getFileGen = async function (self, data) {
   let http = new HttpResetClass()
@@ -79,10 +80,29 @@ let getFileGen = async function (self, data) {
   if (result.data.meterinfo.length === 0) {
     // 预备户可以不填表具信息 所以修正时如果没有表具信息 则初始化一个
     result.data.meterinfo.push({
-      f_meternumber: '', f_metertitles: '', f_area_code: '', gasbrand: '', gasmodel: '', gasmodeltype: '',
-      pricetype: '', pricename: '', f_user_type: '', f_gasproperties: '', f_inputtor: '', f_position: '',
-      f_userfiles_address: '', f_usetype: '', f_usestate: '', f_aroundmeter: '', f_garbage_fee: '否', f_meter_base: '',
-      f_initial_base: '', f_gas_person: '', f_adjustable: '', f_detailprice: '', devicesinfo: []
+      f_meternumber: '',
+      f_metertitles: '',
+      f_area_code: '',
+      gasbrand: '',
+      gasmodel: '',
+      gasmodeltype: '',
+      pricetype: '',
+      pricename: '',
+      f_user_type: '',
+      f_gasproperties: '',
+      f_inputtor: '',
+      f_position: '',
+      f_userfiles_address: '',
+      f_usetype: '',
+      f_usestate: '',
+      f_aroundmeter: '',
+      f_garbage_fee: '否',
+      f_meter_base: '',
+      f_initial_base: '',
+      f_gas_person: '',
+      f_adjustable: '',
+      f_detailprice: '',
+      devicesinfo: []
     })
   }
 
@@ -310,6 +330,13 @@ export default {
       if (this.row) {
         this.data.baseinfo.base.version = this.row.version
       }
+
+      this.data.baseinfo.base.f_user_name = Util.removerUnnecessary(this.data.baseinfo.base.f_user_name)
+      this.data.baseinfo.base.f_user_phone = Util.removerUnnecessary(this.data.baseinfo.base.f_user_phone)
+      this.data.meterinfo.forEach((item) => {
+        item.f_meternumber = Util.removerUnnecessary(item.f_meternumber)
+      })
+
       this.$FileManageService.fileSave(this.$FileManageService.fileSaveBefore(this.data)).then((res) => {
         this.savePrintSheet(res.data.result[0])
         this.$dispatch('success')
@@ -338,7 +365,7 @@ export default {
       return new Blob([bytesCode], {type: 'image/jpeg'})
     },
     newPhoto (Imgbase64) {
-      console.log('imgbase----->',Imgbase64)
+      console.log('imgbase----->', Imgbase64)
       let form = new FormData()
       let xhr = new XMLHttpRequest()
       let formDataBoundary = '----WebkitFormBoundary' + 'GaoPaiYi'

package/src/filiale/kelai/UserGeneralInfoTest.vue

@@ -108,6 +108,7 @@
 <script>
 import UserPaperInfoTest from '../../components/FilesManage/UserPaperInfoTest.vue'
 import {HttpResetClass} from 'vue-client'
+import * as Util from '../../Util'
 
 let getFileGen = async function (self, data) {
   let http = new HttpResetClass()
@@ -316,6 +317,11 @@ export default {
       }
       this.seaching = true
       console.log('档案保存之前，。。。', this.data)
+      this.data.baseinfo.base.f_user_name = Util.removerUnnecessary(this.data.baseinfo.base.f_user_name)
+      this.data.baseinfo.base.f_user_phone = Util.removerUnnecessary(this.data.baseinfo.base.f_user_phone)
+      this.data.meterinfo.forEach((item) => {
+        item.f_meternumber = Util.removerUnnecessary(item.f_meternumber)
+      })
       if (this.data.meterinfo[0].f_gas_date != null) {
         this.data.addressinfo.f_address_state = '已通气'
       }

package/src/filiale/konggang/UserGeneralInfoTest.vue

@@ -107,6 +107,7 @@
 <script>
   import UserPaperInfoTest from '../../components/FilesManage/UserPaperInfoTest'
   import {HttpResetClass} from 'vue-client'
+  import * as Util from '../../Util'
 
   let getFileGen = async function (self, data) {
 
@@ -310,6 +311,11 @@
           this.data.baseinfo.base.version = this.row.version
         }
         console.log('档案保存之前，。。。', this.data)
+        this.data.baseinfo.base.f_user_name = Util.removerUnnecessary(this.data.baseinfo.base.f_user_name)
+        this.data.baseinfo.base.f_user_phone = Util.removerUnnecessary(this.data.baseinfo.base.f_user_phone)
+        this.data.meterinfo.forEach((item) => {
+          item.f_meternumber = Util.removerUnnecessary(item.f_meternumber)
+        })
         if (this.data.meterinfo[0].f_gas_date != null) {
           this.data.addressinfo.f_address_state = '已通气'
         }

package/src/filiale/liaoyuan/FileManage/UserGeneralInfoTest.vue

@@ -68,6 +68,7 @@
 <script>
 import UserPaperInfoTest from './UserPaperInfoTest'
 import {HttpResetClass} from 'vue-client'
+import * as Util from '../../../Util'
 
 let getFileGen = async function (self, data) {
   let http = new HttpResetClass()
@@ -218,6 +219,11 @@ export default {
         this.data.baseinfo.base.version = this.row.version
       }
       console.log('档案保存之前，。。。', this.data)
+      this.data.baseinfo.base.f_user_name = Util.removerUnnecessary(this.data.baseinfo.base.f_user_name)
+      this.data.baseinfo.base.f_user_phone = Util.removerUnnecessary(this.data.baseinfo.base.f_user_phone)
+      this.data.meterinfo.forEach((item) => {
+        item.f_meternumber = Util.removerUnnecessary(item.f_meternumber)
+      })
       this.fileSaveData = this.$FileManageService.fileSaveBefore(this.data)
       this.$FileManageService.fileSave(this.fileSaveData).then((res) => {
         this.$parent.resdata = res.data.result[0].f_userinfo_code

package/src/filiale/macheng/FilesManageNew/UserGeneralInfoTest.vue

@@ -68,6 +68,7 @@
 <script>
   import UserPaperInfoTest from './UserPaperInfoTest'
   import {HttpResetClass} from 'vue-client'
+  import * as Util from '../../../Util'
 
   let getFileGen = async function (self, data) {
   let http = new HttpResetClass()
@@ -294,6 +295,11 @@ export default {
           this.data.baseinfo.base.version = this.row.version
         }
         console.log('档案保存之前，。。。', this.data)
+        this.data.baseinfo.base.f_user_name = Util.removerUnnecessary(this.data.baseinfo.base.f_user_name)
+        this.data.baseinfo.base.f_user_phone = Util.removerUnnecessary(this.data.baseinfo.base.f_user_phone)
+        this.data.meterinfo.forEach((item) => {
+          item.f_meternumber = Util.removerUnnecessary(item.f_meternumber)
+        })
         this.$FileManageService.fileSave(this.$FileManageService.fileSaveBefore(this.data)).then((res) => {
           this.savePrintSheet(res.data.result[0])
           this.$dispatch('success')
@@ -476,12 +482,12 @@ 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: ''

package/src/filiale/qianneng/FilesManage/UserGeneralInfoTest.vue

@@ -108,6 +108,7 @@
 <script>
   import UserPaperInfoTest from '../../../components/FilesManage/UserPaperInfoTest'
 import {HttpResetClass} from 'vue-client'
+  import * as Util from '../../../Util'
 
 let getFileGen = async function (self, data) {
   let http = new HttpResetClass()
@@ -316,6 +317,11 @@ export default {
       }
       this.seaching = true
       console.log('档案保存之前，。。。', this.data)
+      this.data.baseinfo.base.f_user_name = Util.removerUnnecessary(this.data.baseinfo.base.f_user_name)
+      this.data.baseinfo.base.f_user_phone = Util.removerUnnecessary(this.data.baseinfo.base.f_user_phone)
+      this.data.meterinfo.forEach((item) => {
+        item.f_meternumber = Util.removerUnnecessary(item.f_meternumber)
+      })
       if (this.data.meterinfo[0].f_gas_date != null) {
         this.data.addressinfo.f_address_state = '已通气'
       }

package/src/filiale/qianneng/FilesManageNew/UserGeneralInfoTest.vue

@@ -71,6 +71,7 @@
 <script>
 import UserPaperInfoTest from './UserPaperInfoTest'
 import {HttpResetClass} from 'vue-client'
+import * as Util from '../../../Util'
 
 let getFileGen = async function (self, data) {
   let http = new HttpResetClass()
@@ -309,6 +310,11 @@ export default {
         this.data.baseinfo.base.version = this.row.version
       }
       console.log('档案保存之前，。。。', this.data)
+      this.data.baseinfo.base.f_user_name = Util.removerUnnecessary(this.data.baseinfo.base.f_user_name)
+      this.data.baseinfo.base.f_user_phone = Util.removerUnnecessary(this.data.baseinfo.base.f_user_phone)
+      this.data.meterinfo.forEach((item) => {
+        item.f_meternumber = Util.removerUnnecessary(item.f_meternumber)
+      })
       this.$FileManageService.fileSave(this.$FileManageService.fileSaveBefore(this.data)).then((res) => {
         this.savePrintSheet(res.data.result[0])
         this.$dispatch('success')

package/src/filiale/qingtongxia/UserGeneralInfoTest.vue

@@ -69,6 +69,7 @@
 <script>
 import UserPaperInfoTest from '../../components/FilesManage/UserPaperInfoTest'
 import {HttpResetClass} from 'vue-client'
+import * as Util from '../../Util'
 
 let getFileGen = async function (self, data) {
   let http = new HttpResetClass()
@@ -221,6 +222,11 @@ export default {
         this.data.baseinfo.base.version = this.row.version
       }
       console.log('档案保存之前，。。。', this.data)
+      this.data.baseinfo.base.f_user_name = Util.removerUnnecessary(this.data.baseinfo.base.f_user_name)
+      this.data.baseinfo.base.f_user_phone = Util.removerUnnecessary(this.data.baseinfo.base.f_user_phone)
+      this.data.meterinfo.forEach((item) => {
+        item.f_meternumber = Util.removerUnnecessary(item.f_meternumber)
+      })
       Object.assign(this.fileSaveData, {}, this.$FileManageService.fileSaveBefore(this.data))
       this.$FileManageService.fileSave(this.fileSaveData).then((res) => {
         this.$parent.resdata = res.data.result[0].f_userinfo_code