sale-client 3.5.89 → 3.5.91

package/build/dev-server.js

@@ -12,7 +12,7 @@ var compiler = webpack(config)
 // 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://192.168.50.4:8400'
 // var fuwu = 'http://121.36.106.17:8400/'
 // 铜川正式
 //  var fuwu = 'http://61.134.55.234:9999/'

package/package.json

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

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/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/webMeter/paramSaveNew/ParamHistory.vue

@@ -6,24 +6,39 @@
           <li class="active"><a>{{data.name}}</a></li>
         </ul>
         <div class="col-sm-12"  style="height: auto" v-for="param in data.params">
-          {{param.name}}：{{row[param.title]}}
+          {{param.name}}：{{row[param.title].bak_val}}
         </div>
       </div>
+      <div style="height: auto">
+        <ul class="nav nav-tabs col-sm-12" >
+          <li class="active"><a>软件版本号</a></li>
+        </ul>
+        {{row['getMeterVersion'].bak_val||'暂无数据'}}
+<!--        [{"yjbbhlength":28,"softversionNo":"n0100081","mzbbhlength":15,"mzversion":"BC25PAR01A04_BT","version":"2022-07-28","yjversion":"YIMS-M-T1-3-1-H-2-13-17_V1.1"}]-->
+      </div>
+      <div style="height: auto">
+        <ul class="nav nav-tabs col-sm-12" >
+          <li class="active"><a>下次上报日期</a></li>
+        </ul>
+        {{row['readNextreportTime'].bak_val||'暂无数据'}}
+      </div>
     </div>
   </div>
   <div class="binary-right" style="width:74%;overflow-y: auto;max-height:1000px;">
     <div class="row list_area table_sy">
       <table class="table table-bordered table-striped table-hover" id="table1" >
         <thead>
-        <th style="text-align:center"><nobr>操作</nobr></th>
-        <th style="text-align:center"><nobr>指令发送状态</nobr></th>
+        <tr>
+          <th style="text-align:center"><nobr>指令发送状态</nobr></th>
+          <th style="text-align:center"><nobr>操作</nobr></th>
+        </tr>
         <!--        <th style="text-align:center"><nobr>客户类型</nobr></th>-->
         <!--        <th style="text-align:center"><nobr>气表品牌</nobr></th>-->
         </thead>
         <tbody>
         <tr v-for="row in history">
-          <td><nobr>{{row.msg}}</nobr></td>
           <td><nobr>{{row.f_instruct_state}}</nobr></td>
+          <td><nobr>{{row.msg}}</nobr></td>
           <!--          <td><nobr>{{row.f_user_type}}</nobr></td>-->
           <!--          <td><nobr>{{row.f_meter_brand}}</nobr></td>-->
         </tr>
@@ -35,77 +50,92 @@
 
 
 <script>
-  import {PagedList} from 'vue-client'
-
 export default {
-    title: '表计信息修改',
-    props: ['user', 'checked1', 'gasbrandid'],
-
-    data () {
-      return {
-        newmeterinfo: [{}],
-        history: [],
-        row: {},
-        gasbrand: null
-      }
-    },
-    ready () {
+  title: '表计信息修改',
+  props: ['user', 'checked1', 'gasbrandid'],
+  data () {
+    return {
+      newmeterinfo: [{}],
+      history: [],
+      row: {},
+      gasbrand: null
+    }
+  },
+  ready () {
 
-    },
-    watch: {
-      'user': {
-        handler: async function (val) {
-          this.history = []
-          if (val.length === 1) {
-            await this.$resetpost('rs/sql/getIotParams', {data: {t_userfiles_id: val[0].f_userfiles_id}}, {resolveMsg: null, rejectMsg: null}).then((rat) => {
-              this.row = {}
-              console.log('=============', rat.data)
-              this.row.forceSafeCheckUsedDayCount = 0
-              this.row.currStairUsedGasCount = 0
-              this.row.forceScrapUsedDayCount = 0
-              this.row.isForceSrape = '1'
-              if (rat.data.length > 0) {
-                rat.data.forEach((item) => {
-                  if(item.f_param_value === '1'){
-                    item.f_param_value = '开'
+  },
+  watch: {
+    'user': {
+      handler: async function (val) {
+        this.history = []
+        if (val.length === 1) {
+          await this.$resetpost('rs/sql/getIotParams', {data: {t_userfiles_id: val[0].f_userfiles_id}}, {resolveMsg: null, rejectMsg: null}).then((rat) => {
+            this.row = {}
+            console.log('=============', rat.data)
+            this.row.forceSafeCheckUsedDayCount = 0
+            this.row.currStairUsedGasCount = 0
+            this.row.forceScrapUsedDayCount = 0
+            this.row.isForceSrape = '1'
+            if (rat.data.length > 0) {
+              rat.data.forEach((item) => {
+                if (item.f_param_value === '1') {
+                  item.f_param_value = '开'
+                }
+                if (item.f_param_value === '0') {
+                  item.f_param_value = '关'
+                }
+                if (item.f_param_name === '读表功能') {
+                  if (item.f_param_value && item.f_param_value === 'getMeterVersion') {
+                    item.f_back_content = JSON.parse(item.f_back_content.replace('[', '').replace(']', ''))['softversionNo']
                   }
-                  if(item.f_param_value === '0'){
-                    item.f_param_value = '关'
+                  if (item.f_param_value && item.f_param_value === 'readNextreportTime') {
+                    let str = JSON.parse(item.f_back_content.replace('[', '').replace(']', ''))['datetime']
+                    item.f_back_content = '20' + str.substr(0, 2) + '-' + str.substr(2, 2) + '-' + str.substr(4, 2) + ' ' +
+                    str.substr(6, 2) + ':' + str.substr(8, 2) + ':' + str.substr(10, 2)
                   }
-                  this.row[item.f_param_lname] = item.f_param_value
-                })
+                  if (!item.f_param_value) {
+                    item.f_param_value = '暂无数据'
+                  }
+                  this.row[item.f_param_value] = {set_val: item.f_param_value, bak_val: item.f_back_content}
+                } else {
+                  this.row[item.f_param_lname] = {set_val: item.f_param_value, bak_val: item.f_back_content}
+                }
+              })
                 // let param = JSON.parse(rat.data[0].f_data)
                 // console.log(param)
                 // this.row= param
-              }
-            })
-            await this.$resetpost('rs/sql/getParamInstruct', {data: {condition: `i.f_userfiles_id='${val[0].f_userfiles_id}'` }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-              this.history = res.data
-            })
-          }
-          if (this.gasbrandid[0]) {
-            await this.refreshParam(this.gasbrandid[0])
-          }
-        },
-        deep: true
+            }
+          })
+          await this.$resetpost('rs/sql/getParamInstruct', {data: {condition: `i.f_userfiles_id='${val[0].f_userfiles_id}'` }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            this.history = res.data
+          })
+        }
+        if (this.gasbrandid[0]) {
+          await this.refreshParam(this.gasbrandid[0])
+        }
+      },
+      deep: true
 
-      }
+    }
+  },
+  methods: {
+    close () {
+      this.$dispatch('close')
     },
-    methods: {
-      close () {
-        this.$dispatch('close')
-      },
-      async refreshParam (val) {
-        this.newmeterinfo = [{}]
-        try {
-          let res = await this.$resetpost('/webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: val}}, {resolveMsg: null, rejectMsg: null})
-          this.newmeterinfo = res.data
-        } catch (error) {
-          this.$showAlert('该气表品牌不支持参数设置', 'warning', 1500)
-        }
+    async refreshParam (val) {
+      this.newmeterinfo = [{}]
+      try {
+        let res = await this.$resetpost('/webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: val}}, {resolveMsg: null, rejectMsg: null})
+        this.newmeterinfo = res.data.filter(item => { return (item.name !== '读表功能' && item.name !== '读记录数据') })
+      } catch (error) {
+        this.$showAlert('该气表品牌不支持参数设置', 'warning', 1500)
       }
+    },
+    readNextReportTime_parse () {
+      let str = JSON.parse(row['readNextreportTime'].bak_val)[0].datetime
     }
   }
+}
 </script>
 <style>
   .btn-border {

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

@@ -0,0 +1,742 @@
+<template>
+  <div class="auto" style="height:80%">
+    <validator name='v'>
+      <p class="bg-info text-center" style="padding: 8px;">{{usertype ? '特殊地址管理' : '民用地址管理'}}</p>
+      <div class="auto select-overspread form-horizontal">
+        <div class="form-group" v-if="!usertype&&!model.id">
+          <input type="radio" id="true" value="one" v-model="onedata">
+          <label for="one">单户</label>
+          <input type="radio" id="false" value="more" v-model="onedata">
+          <label for="more">多户</label>
+        </div>
+        <!--单个录入-->
+        <div v-if="onedata=='one'" class="row">
+          <div class="col-sm-6 form-group "
+               :class="[$v.f_pcd_id.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">省111&ensp;市&ensp;区</label>
+            <input type="text" style="width:41%" v-show="false" v-model="model.f_pcd_id"
+            >
+            <v-select :value.sync="model.f_pcd_id" :value-single="true"
+                      :options='pcdslist' placeholder='请选择'
+                      close-on-select search="true"  @change="pcdChange" :disabled="!usertype">
+            </v-select>
+          </div>
+
+          <div class="col-sm-6 form-group " v-if="!usertype"
+               :class="[$v.f_street_id.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">街道名称</label>
+            <input type="text" style="width:41%" v-show="false" v-model="model.f_street_id"
+            >
+            <v-select :value.sync="model.f_street_id" :value-single="true"
+                      :options='streetslist' placeholder='请选择'
+                      close-on-select search="true" :disabled="!usertype">
+            </v-select>
+          </div>
+          <div class="col-sm-6 form-group " v-if="usertype"
+               :class="[$v.f_street_id.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">街道名称</label>
+            <input type="text" style="width:41%" v-show="false" v-model="model.f_street_id"
+            >
+            <v-select :value.sync="model.f_street_id" :value-single="true"
+                      :options='streetslist' placeholder='请选择'
+                      @change="streetChange"
+                      close-on-select search="true" :disabled="!usertype">
+            </v-select>
+          </div>
+          <div  class="col-sm-6 form-group " v-if="!usertype"
+                :class="[$v.f_residential_area_id1.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">小区名称</label>
+            <input type="text" style="width:41%" v-show="false" v-model="model.f_residential_area_id"
+                   v-validate:f_residential_area_id1='{required: true }'>
+            <v-select :value.sync="model.f_residential_area_id" :value-single="true"
+                      :options='areaslist' placeholder='请选择'
+                      @change="areaChange"
+                      close-on-select search="true">
+            </v-select>
+          </div>
+
+          <div  class="col-sm-6 form-group " v-if="usertype">
+            <label class="font_normal_body">小区名称</label>
+            <v-select :value.sync="model.f_residential_area_id" :value-single="true"
+                      :options='areaslist' placeholder='请选择'
+                      @change="areaChange"
+                      close-on-select search="true">
+            </v-select>
+          </div>
+
+          <div class="col-sm-6 form-group " :class="[$v.slice1.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">片&emsp;&emsp;区</label>
+            <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"
+                   v-validate:slice1='{required: true }'>
+            <v-select :value.sync="model.slice_area" v-model="model.slice_area"
+                      :options='sliceArea' placeholder='片区/管理站' filer-key="name"
+                      close-on-select v-ref:slice>
+            </v-select>
+          </div>
+          <div v-if="!usertype" class="col-sm-6 form-group ">
+            <label for="f_address" class="font_normal_body">楼&emsp;&emsp;号</label>
+            <input type="text" style="width:40%" v-model="model.f_building" class="input_search"
+                   placeholder="楼号"/>
+            <input type="text" style="width:20%" v-model="model.f_building_suffix" class="input_search"
+            />
+
+          </div>
+          <div v-if="!usertype" class="col-sm-6 form-group ">
+            <label for="f_address" class="font_normal_body">单&emsp;&emsp;元</label>
+            <input type="text" style="width:40%" v-model="model.f_unit" class="input_search" placeholder="单元"/>
+            <input type="text" style="width:20%" v-model="model.f_unit_suffix" class="input_search"
+            />
+          </div>
+          <div v-if="!usertype" class="col-sm-6 form-group ">
+            <label for="f_address" class="font_normal_body">楼&emsp;&emsp;层</label>
+            <input type="text" style="width:40%" v-model="model.f_floor" class="input_search"
+                   placeholder="楼层" />
+            <input type="text" style="width:20%" v-model="model.f_floor_suffix" class="input_search"
+            />
+          </div>
+          <div v-if="!usertype" class="col-sm-6 form-group "
+               :class="[$v.f_room.required ? 'has-error' : 'has-success']">
+            <label for="f_address" class="font_normal_body">门&ensp;牌&ensp;号</label>
+            <input type="text" style="width:40%" v-model="model.f_room" class="input_search" placeholder="门牌号"
+                   v-validate:f_room='{required: true }'/>
+            <input type="text" style="width:20%" v-model="model.f_room_suffix" class="input_search"
+            />
+          </div>
+          <div class="col-sm-6 form-group">
+            <label class="font_normal_body">地址状态</label>
+            <v-select :value.sync="model.f_address_state" :value-single="true"
+                      class="select_list select"
+                      condition="f_address_state = '{}'"
+                      :options='addresstate' placeholder='地址状态'
+                      close-on-select>
+            </v-select>
+          </div>
+          <div v-if="usertype" class="col-sm-12 form-group "
+               :class="[$v.f_address.required ? 'has-error' : 'has-success']">
+            <label for="f_address" class="font_normal_body">详细地址</label>
+            <input type="text" style="width:80%" v-model="model.f_address" class="input_search" placeholder="详细地址"
+                   v-validate:f_address='{required: true }'/>
+          </div>
+          <div class="col-sm-12 form-group">
+            <label  class="font_normal_body " >备&emsp;&emsp;注</label>
+            <textarea class="input_textarea" rows="3" style="margin-top: 25px; width:80%;height: auto;" v-model="model.f_comments"></textarea>
+          </div>
+          <div style="text-align:right;margin-top:40px;margin-right:50px;" class="col-sm-12">
+            <button class="button_search button_spacing" @click="confirm()" :disabled='!$v.valid'>保存</button>
+            <button class="button_clear button_spacing" @click="cancel()">取消</button>
+          </div>
+
+        </div>
+        <!--批量录入-->
+        <div v-if="onedata=='more'" class="row">
+          <div class="col-sm-6 form-group "
+               :class="[$v.f_pcd_id.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">省&ensp;市&ensp;区</label>
+            <input type="text" style="width:60%" v-show="false" v-model="model.f_pcd_id"
+            >
+            <v-select :value.sync="model.f_pcd_id" :value-single="true"
+                      :options='pcdslist' placeholder='请选择'
+                      close-on-select search="true" @change="pcdChange" :disabled="!usertype">
+            </v-select>
+          </div>
+          <div class="col-sm-6 form-group "
+               :class="[$v.f_street_id.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">街&emsp;&emsp;道</label>
+            <input type="text" style="width:60%" v-show="false" v-model="model.f_street_id"
+            >
+            <v-select :value.sync="model.f_street_id" :value-single="true"
+                      :options='streetslist' placeholder='请选择'
+                      close-on-select search="true" :disabled="!usertype">
+            </v-select>
+          </div>
+          <div class="col-sm-6 form-group "
+               :class="[$v.f_residential_area_id.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">小区名称</label>
+            <input type="text" style="width:60%" v-show="false" v-model="model.f_residential_area_id"
+                   v-validate:f_residential_area_id='{required: true }'>
+            <v-select :value.sync="model.f_residential_area_id" :value-single="true"
+                      @change="areaChange"
+                      :options='areaslist' placeholder='请选择'
+                      close-on-select search="true">
+            </v-select>
+          </div>
+          <div class="col-sm-6 form-group " :class="[$v.slice.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">片&emsp;&emsp;区</label>
+            <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"
+                   v-validate:slice='{required: true }'>
+            <v-select :value.sync="model.slice_area" v-model="model.slice_area"
+                      :options='sliceArea' placeholder='片区/管理站' filer-key="name"
+                      close-on-select v-ref:slice>
+            </v-select>
+          </div>
+
+          <div class="col-sm-6 form-group "
+               :class="[$v.f_building_start.integernum || $v.f_building_start.dctest ?'has-error' : 'has-success']">
+            <label for="f_address" class="font_normal_body">起始楼号</label>
+            <input type="text" style="width:15%" placeholder="前缀" v-model="model.f_building_prefix" class="input_search"/>
+            <input type="text" style="width:25%"
+                   v-validate:f_building_start='{integernum: true ,dctest: [model.f_building_end, "<=" ]}'
+                   v-model="model.f_building_start" class="input_search" placeholder="楼号"/>
+            <input type="text" style="width:17%" v-model="model.f_building_suffix" class="input_search"/>
+          </div>
+          <div class="col-sm-6 form-group "
+               :class="[$v.f_building_end.integernum ||$v.f_building_end.dctest ? 'has-error' : 'has-success']">
+            <label for="f_address" class="font_normal_body">截止楼号</label>
+            <input type="text" style="width:15%" placeholder="前缀" v-model="model.f_building_prefix" class="input_search"/>
+            <input type="text" style="width:25%"
+                   v-validate:f_building_end='{integernum: true ,dctest: [model.f_building_start, ">=" ]}'
+                   v-model="model.f_building_end" class="input_search" placeholder="楼号"/>
+            <input type="text" style="width:17%" v-model="model.f_building_suffix" class="input_search"
+            />
+          </div>
+          <div class="col-sm-6 form-group  "
+               :class="[$v.f_unit_start.integernum || $v.f_unit_start.dctest ? 'has-error' : 'has-success']">
+            <label for="f_address" class="font_normal_body">起始单元</label>
+            <input type="text" style="width:15%" placeholder="前缀" v-model="model.f_unit_prefix" class="input_search" />
+            <input type="text" style="width:25%"
+                   v-validate:f_unit_start='{integernum: true ,dctest: [model.f_unit_end, "<=" ]}'
+                   v-model="model.f_unit_start" class="input_search" placeholder="单元"/>
+            <input type="text" style="width:17%" v-model="model.f_unit_suffix" class="input_search" />
+          </div>
+          <div class="col-sm-6 form-group  "
+               :class="[$v.f_unit_end.integernum ||$v.f_unit_end.dctest ? 'has-error' : 'has-success']">
+            <label for="f_address" class="font_normal_body">截止单元</label>
+            <input type="text" style="width:15%" placeholder="前缀" v-model="model.f_unit_prefix" class="input_search" />
+            <input type="text" style="width:25%"
+                   v-validate:f_unit_end='{integernum: true ,dctest: [model.f_unit_start, ">="]}'
+                   v-model="model.f_unit_end" class="input_search" placeholder="单元"/>
+            <input type="text" style="width:17%" v-model="model.f_unit_suffix" class="input_search"/>
+          </div>
+          <div class="col-sm-6 form-group  "
+               :class="[$v.f_floor_start.integernum || $v.f_floor_start.dctest  ? 'has-error' : 'has-success']">
+            <label for="f_address" class="font_normal_body">起始楼层</label>
+            <input type="text" style="width:15%" placeholder="前缀" v-model="model.f_floor_prefix" class="input_search"/>
+            <input type="text" style="width:25%"
+                   v-validate:f_floor_start='{integernum: true,dctest: [model.f_floor_end, "<=" ] }'
+                   v-model="model.f_floor_start" class="input_search" placeholder="楼层"/>
+            <input type="text" style="width:17%" v-model="model.f_floor_suffix" class="input_search"/>
+          </div>
+          <div class="col-sm-6 form-group  "
+               :class="[$v.f_floor_end.integernum ||$v.f_floor_end.dctest ? 'has-error' : 'has-success']">
+            <label for="f_address" class="font_normal_body">截止楼层</label>
+            <input type="text" style="width:15%" placeholder="前缀" v-model="model.f_floor_prefix" class="input_search"/>
+            <input type="text" style="width:25%" v-model="model.f_floor_end"
+                   v-validate:f_floor_end='{integernum: true,dctest: [model.f_floor_start, ">=" ] }'
+                   class="input_search" placeholder="楼层"/>
+            <input type="text" style="width:17%" v-model="model.f_floor_suffix" class="input_search"/>
+          </div>
+          <div class="col-sm-6 form-group "
+               :class="[$v.f_room_start.integernum || $v.f_room_start.dctest ? 'has-error' : 'has-success']">
+            <label for="f_address" class="font_normal_body">起始门牌</label>
+            <input type="text" style="width:15%" placeholder="前缀" v-model="model.f_room_prefix" class="input_search"/>
+            <input type="text" style="width:25%" v-model="model.f_room_start"
+                   class="input_search" placeholder="门牌号"
+                   v-validate:f_room_start='{integernum: true ,dctest: [model.f_room_end, "<=" ]}'
+            />
+            <input type="text" style="width:17%" v-model="model.f_room_suffix" class="input_search"/>
+          </div>
+          <div class="col-sm-6 form-group "
+               :class="[$v.f_room_end.integernum ||$v.f_room_end.dctest ? 'has-error' : 'has-success']">
+            <label for="f_address" class="font_normal_body">截止门牌</label>
+            <input type="text" style="width:15%" placeholder="前缀" v-model="model.f_room_prefix" class="input_search"/>
+            <input type="text" style="width:25%" v-model="model.f_room_end" class="input_search" placeholder="门牌号"
+                   v-validate:f_room_end='{integernum: true ,dctest: [model.f_room_start, ">=" ]}'/>
+            <input type="text" style="width:17%" v-model="model.f_room_suffix" class="input_search"/>
+          </div>
+          <div class="col-sm-6 form-group">
+            <label class="font_normal_body">地址状态</label>
+            <v-select :value.sync="model.f_address_state" :value-single="true"
+                      class="select_list select"
+                      condition="f_address_state = '{}'"
+                      :options='addresstate' placeholder='地址状态'
+                      close-on-select>
+            </v-select>
+          </div>
+          <div class="col-sm-10 form-group ">
+            <p class="navbar-text" style="margin-left: 10%">说明: 层数输入1,门牌号输入001。产生的最终门牌号显示1001</p>
+          </div>
+          <div  class="col-sm-12 form-group">
+            <label  class="font_normal_body " style="margin-top:-20px">备&emsp;&emsp;注</label>
+            <textarea class="input_textarea" rows="3" style="width:80%;height: auto;" v-model="model.f_comments"></textarea>
+          </div>
+          <div class="row">
+            <div style="text-align:right;margin-top:20px;margin-right:50px;" class="col-sm-12">
+              <button class="button_search button_spacing" @click="confirmall()" :disabled='!$v.valid'>保存</button>
+              <button class="button_clear button_spacing" @click="cancel()">取消</button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </validator>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  let getAreaConfig = async function (self) {
+    // 获取气价里面的配置
+    await self.$getConfig(self, 'UserAddress')
+    console.log('原地址配置', self.config)
+    console.log('获取地址配置', self.config)
+    Object.assign(self.model, self.config)
+    self.initdata()
+  }
+
+  export default {
+    title: '用户地址添加',
+    data () {
+      return {
+        // 初始化省市区数据
+        pcdslist: [],
+        // 初始化街道数据
+        streetslist: [],
+        // 初始化街道数据
+        areaslist: [],
+        config: {
+          f_building_suffix: '号楼',
+          f_unit_suffix: '单元',
+          f_floor_suffix: '层',
+          f_room_suffix: '室'
+        },
+        model: {
+          f_pcd_id: '',
+          f_street_id: '',
+          f_comments: '',
+          f_residential_area_id: '',
+          f_pcd: '',
+          f_street: '',
+          f_residential_area: '',
+          f_slice_area: '',
+          f_building: '',
+          f_building_start: '',
+          f_building_end: '',
+          f_building_suffix: '',
+          f_unit: '',
+          f_unit_start: '',
+          f_unit_end: '',
+          f_unit_suffix: '',
+          f_floor: '',
+          f_floor_start: '',
+          f_floor_end: '',
+          f_floor_suffix: '',
+          f_room: '',
+          f_room_start: '',
+          f_room_end: '',
+          f_room_suffix: '',
+          // 详细地址
+          f_address: '',
+          // 单位名称
+          f_company: '',
+          // 单位地址
+          f_company_address: ''
+        },
+        // 判读是否为单个数据录入
+        onedata: 'one',
+        // 选中所有地址
+        addresslist: [],
+        usertype: false,
+
+        // 公司信息
+        curorgid: [this.$login.f.orgid],
+
+        f_orgid: '',
+
+        sliceArea: []
+      }
+    },
+    props: ['f_filialeids', 'row', 'operation', 'usertype'],
+    ready () {
+      getAreaConfig(this)
+    },
+    methods: {
+      async initdata () {
+        this.model.f_address_state = '已通气'
+        this.initAreas(this.f_filialeids)
+        // 添加特殊地址选省市区
+
+        this.initpcds(` f_orgid = '${this.f_filialeids}'`)
+        this.initstreets(` f_orgid = '${this.f_filialeids}' `)
+        this.initareas(` f_orgid = '${this.f_filialeids}'`)
+      },
+
+      // 初始化片区
+      async initAreas (val) {
+        if (val) {
+          let getAllArea = await this.$resetpost('/rs/search', {
+            source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+            userid: this.$login.f.id
+          }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+
+          let arr = getAllArea.data.filter((res) => {
+            return res.parentid == val
+          })
+          console.log('过滤之后的片区', arr)
+          this.sliceArea = []
+          arr.forEach((res) => {
+            this.sliceArea.push({label: res.name, value: {name: res.name, code: res.number}})
+          })
+        }
+      },
+      // 初始化省市区,添加街道
+      async initpcds (pconditon) {
+        this.pcdslist = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+          data: {
+            items: '*',
+            tablename: 't_pcd',
+            orderitem: 'id',
+            condition: pconditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row, n) => {
+          redata[n] = {
+            label: row.f_pcd,
+            value: row.id,
+            data: row,
+            id: row.id
+          }
+        })
+        this.pcdslist = redata
+      },
+      // 初始化街道 添加小区
+      async initstreets (pconditon) {
+        this.streetslist = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+          data: {
+            items: '*',
+            tablename: 't_street',
+            orderitem: 'id',
+            condition: pconditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row, n) => {
+          redata[n] = {
+            label: row.f_street,
+            value: row.id,
+            data: row,
+            id: row.id
+          }
+        })
+        this.streetslist = redata
+      },
+      // 初始化小区添加小区
+      async initareas (pconditon) {
+        // if(this.usertype){
+        //   pconditon=pconditon+` and  f_special='1' `
+        // }
+        this.areaslist = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+          data: {
+            items: '*',
+            tablename: 't_area',
+            orderitem: 'id',
+            condition: pconditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row) => {
+          redata.push({
+            label: row.f_residential_area,
+            value: row.id,
+            data: row,
+            id: row.id
+          })
+        })
+        this.areaslist = redata
+      },
+      // 省/市/区变化
+      async pcdChange (val) {
+        // 只有添加特殊地址时才级联
+        if (!this.usertype) {
+          return
+        }
+        console.log('省/市/区变化', val)
+        if (val) {
+          // 那就把[小区，街道]重新组织一下
+          await this.initstreets(`  f_pcd_id ='${val}' `)
+          if (this.model.f_street_id) {
+            if (this.findbyid(this.streetslist, this.model.f_street_id)) {
+              let pcd_id = this.findbyid(this.streetslist, this.model.f_street_id).f_pcd_id
+              if (pcd_id != val) {
+                this.model.f_street_id = ''
+              }
+            } else {
+              this.model.f_street_id = ''
+            }
+
+            // 那就把[小区，街道]重新组织一下
+            if (this.model.f_street_id) {
+              await this.initareas(` f_street_id ='${this.model.f_street_id}' `)
+              if (this.model.f_residential_area_id) {
+                if (this.findbyid(this.areaslist, this.model.f_residential_area_id)) {
+                  let pcd_id = this.findbyid(this.areaslist, this.model.f_residential_area_id).f_pcd_id
+                  if (pcd_id != val) {
+                    this.model.f_residential_area_id = ''
+                  }
+                } else {
+                  this.model.f_residential_area_id = ''
+                }
+              }
+            }
+          }
+        }
+        this.$resetValidation()
+      },
+      // 小区变化
+      areaChange (val) {
+        console.log('小区变化', val)
+        // 选择小区后级联出省市区和街道
+        let selectArea // 选中的小区数据
+        for (let row of this.areaslist) {
+          if (val == row.value) {
+            selectArea = row.data
+            break
+          }
+        }
+        if (selectArea) {
+          this.model.f_street_id = selectArea.f_street_id
+          this.model.f_pcd_id = selectArea.f_pcd_id
+          this.initstreets(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_street_id}' `)
+          this.initpcds(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_pcd_id}' `)
+          this.model.slice_area = [{name: selectArea.f_slice_area, code: selectArea.f_area_code}]
+          // 拼接地址
+          this.model.f_address = `${selectArea.f_street}${selectArea.f_residential_area}`
+        }
+        this.$nextTick(() => {
+          this.$resetValidation()
+        })
+      },
+      // 街道变化
+      async streetChange (val) {
+        console.log('街道变化', val)
+        if (this.streetslist[0]) {
+          var street = ''
+          this.streetslist.forEach((item) => {
+            if (item.id === val) {
+              street = item.label
+            }
+          })
+          this.model.f_address = street
+        }
+        if (val) {
+          // 那就把[小区]重新组织一下
+          await this.initareas(` f_street_id ='${val}' `)
+          if (this.model.f_residential_area_id) {
+            if (this.findbyid(this.areaslist, this.model.f_residential_area_id)) {
+              let street_id = this.findbyid(this.areaslist, this.model.f_residential_area_id).f_street_id
+              if (street_id != val) {
+                this.model.f_residential_area_id = ''
+              }
+            } else {
+              this.model.f_residential_area_id = ''
+            }
+          }
+        }
+        this.$resetValidation()
+      },
+
+      getorg (val) {
+        this.f_orgid = val[0]
+      },
+
+      // 处理批量地址信息
+      dealaddlist () {
+        try {
+          var resultlist = []
+          for (var i = parseInt(this.model.f_building_start); i <= parseInt(this.model.f_building_end); i++) {
+            for (var j = parseInt(this.model.f_unit_start); j <= parseInt(this.model.f_unit_end); j++) {
+              for (var m = parseInt(this.model.f_floor_start); m <= parseInt(this.model.f_floor_end); m++) {
+                for (var n = parseInt(this.model.f_room_start); n <= parseInt(this.model.f_room_end); n++) {
+                  // 预备一个空的json
+                  console.log('批量', this.model)
+                  let data = Object.assign({}, this.model)
+                  data.f_create_person = this.$login.f.name
+                  data.f_building = data.f_building_prefix + i
+                  data.f_unit = data.f_unit_prefix + j
+                  data.f_floor = data.f_floor_prefix + m
+                  // 目前房号都按两位处理 如： 101室 201室 110室
+                  if ((n + '').length == 1) {
+                    data.f_room = data.f_room_prefix + m + '0' + n
+                  } else {
+                    data.f_room = data.f_room_prefix + m + '' + n
+                  }
+                  data.f_filialeid = this.f_filialeids
+                  data.f_operator = this.$login.f.name
+                  data.f_operatorid = this.$login.f.id
+                  data.f_orgid = this.$login.f.orgid
+                  data.f_orgname = this.$login.f.orgs
+                  data.f_depid = this.$login.f.depids
+                  data.f_depname = this.$login.f.deps
+                  data.f_pcd = this.findbyid(this.pcdslist, this.model.f_pcd_id).f_pcd
+                  data.f_street = this.findbyid(this.streetslist, this.model.f_street_id).f_street
+                  data.f_residential_area = this.findbyid(this.areaslist, this.model.f_residential_area_id).f_residential_area
+                  data.f_address = data.f_street +
+                  data.f_residential_area +
+                    data.f_building + data.f_building_suffix +
+                  data.f_unit + data.f_unit_suffix +
+                  data.f_floor + data.f_floor_suffix +
+                  data.f_room + data.f_room_suffix
+                  if (this.model.slice_area) {
+                    if (this.model.slice_area.length > 0) {
+                      data.f_slice_area = this.model.slice_area[0].name
+                      data.f_area_code = this.model.slice_area[0].code
+                    }
+                  }
+                  resultlist.push(data)
+                }
+              }
+            }
+          }
+          this.addresslist = resultlist
+        } catch (e) {
+          console.log(e)
+          this.$showAlert('输出数据有误，请检查', 'warning', 2000)
+        }
+      },
+      // 保存多个
+      async confirmall () {
+        this.dealaddlist()
+        if (this.addresslist.length > 0) {
+          let msg = {
+            resolveMsg: '地址保存成功',
+            rejectMsg: '地址保存失败'
+          }
+          this.$showMessage('确定要批量添加' + this.addresslist.length + '户地址吗？，如有已经存在的，将会重复添加！！！', ['confirm', 'cancel']).then((res) => {
+            if (res === 'confirm') {
+              this.$resetpost('rs/logic/address_adduserlist', {data: {addlist: this.addresslist}}, msg).then((req) => {
+                this.cleardara()
+                this.$dispatch('confirm')
+              })
+            }
+          })
+        }
+      },
+      // 保存
+      async confirm () {
+        if (this.onedata == 'one') {
+          await this.saveonedata()
+        }
+        this.cleardara()
+        this.$dispatch('confirm')
+      },
+      // 保存一户信息
+      async saveonedata () {
+        this.model.f_create_person = this.$login.f.name
+        this.model.f_filialeid = this.f_filialeids
+        this.model.f_operator = this.$login.f.name
+        this.model.f_operatorid = this.$login.f.id
+        this.model.f_orgid = this.$login.f.orgid
+        this.model.f_orgname = this.$login.f.orgs
+        this.model.f_depid = this.$login.f.depids
+        this.model.f_depname = this.$login.f.deps
+        if (this.model.slice_area) {
+          if (this.model.slice_area.length > 0) {
+            this.model.f_slice_area = this.model.slice_area[0].name
+            this.model.f_area_code = this.model.slice_area[0].code
+          }
+        }
+        if (this.usertype) {
+          // 非民用
+          this.model.f_special = '1'
+          this.model.f_building_suffix = ''
+          this.model.f_unit_suffix = ''
+          this.model.f_floor_suffix = ''
+          this.model.f_room_suffix = ''
+          this.model.f_pcd = this.findbyid(this.pcdslist, this.model.f_pcd_id).f_pcd
+          this.model.f_street = this.findbyid(this.streetslist, this.model.f_street_id).f_street
+          this.model.f_residential_area = this.findbyid(this.areaslist, this.model.f_residential_area_id) ? this.findbyid(this.areaslist, this.model.f_residential_area_id).f_residential_area : ''
+        } else {
+          // 民用
+          this.model.f_pcd = this.findbyid(this.pcdslist, this.model.f_pcd_id).f_pcd
+          this.model.f_street = this.findbyid(this.streetslist, this.model.f_street_id).f_street
+          this.model.f_residential_area = this.findbyid(this.areaslist, this.model.f_residential_area_id).f_residential_area
+          this.model.f_address = this.model.f_pcd + this.model.f_street + this.model.f_residential_area + (this.model.f_building ? this.model.f_building + this.model.f_building_suffix : '') + (this.model.f_unit ? this.model.f_unit + this.model.f_unit_suffix : '') + (this.model.f_floor ? this.model.f_floor + this.model.f_floor_suffix : '') + this.model.f_room + this.model.f_room_suffix
+        }
+        await this.$resetpost('rs/logic/address_updateuseraddress', this.model)
+      },
+      cancel () {
+        this.cleardara()
+        this.$dispatch('cancel')
+      },
+      cleardara () {
+        this.model = {
+          f_pcd_id: '',
+          f_street_id: '',
+          f_residential_area_id: '',
+          f_pcd: '',
+          f_comments: '',
+          f_street: '',
+          f_residential_area: '',
+          f_slice_area: '',
+          f_building: '',
+          f_building_start: '',
+          f_building_end: '',
+          f_building_prefix: '',
+          f_building_suffix: this.config.f_building_suffix,
+          f_unit: '',
+          f_unit_start: '',
+          f_unit_end: '',
+          f_unit_prefix: '',
+          f_unit_suffix: this.config.f_unit_suffix,
+          f_floor: '',
+          f_floor_start: '',
+          f_floor_end: '',
+          f_floor_prefix: '',
+          f_floor_suffix: this.config.f_floor_suffix,
+          f_room: '',
+          f_room_start: '',
+          f_room_end: '',
+          f_room_prefix: '',
+          f_room_suffix: this.config.f_room_suffix,
+          // 详细地址
+          f_address: '',
+          // 单位名称
+          f_company: '',
+          // 单位地址
+          f_company_address: ''
+        }
+        // this.pcdslist = []
+        // this.streetslist = []
+        // this.areaslist = []
+      },
+
+      // 根据名字找数据
+      findbyid (list, name) {
+        var result
+        list.forEach((row, n) => {
+          if (name == row.value) {
+            result = row.data
+          }
+        })
+        return result
+      }
+    },
+    watch: {
+      // 分公司变化
+      'f_filialeids' () {
+        if (this.model.f_filialeid) {
+          if (this.model.f_filialeid != this.f_filialeids) {
+            this.$dispatch('cancel')
+          }
+        }
+        this.cleardara()
+        this.initdata()
+      },
+      'row' () {
+        this.onedata = 'one'
+      }
+    },
+    computed: {
+      // 地址状态下拉框
+      addresstate () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]
+      }
+    }
+  }
+</script>

package/src/filiale/chengtou/sale.js

@@ -9,6 +9,10 @@ let specialComp = {
   },
   'other-charge-new': (resolve) => {
     require(['./components/OtherChargeNew'], resolve)
-  }
+  },
+  // 地址管理
+  'file-user-address': (resolve) => {
+    require(['./components/FilesManage/FileUserAddress'], resolve)
+  },
 }
 exports.specialComp = specialComp

package/src/filiale/guangxi/ChargeOper.vue

@@ -133,8 +133,8 @@
       }
       if (self.operBtns.length > 0) {
         self.isBusiness = true
-        if(self.data.f_newtable_fillgas > 0 ){
-          let confirm = await self.$showMessage(`用户${self.data.f_userfiles_id}还有${self.data.f_newtable_fillgas}方旧表余气未补,是否要补气`, ['confirm', 'cancel'])
+        if(self.data.f_remanent_gas > 0 ){
+          let confirm = await self.$showMessage(`用户${self.data.f_userfiles_id}还有${self.data.f_remanent_gas}方旧表余气未补,是否要补气`, ['confirm', 'cancel'])
           if (confirm === 'confirm'){
             let id1 = self.operBtns.findIndex((arr) => arr.name === '补气购气')
             self.$refs.route.init(self.operBtns[id1].value.routeName, {row: self.data, cardData: self.cardInfo})

package/src/filiale/guangxi/ResetMeter.vue

@@ -489,7 +489,7 @@ export default {
       this.printok()
     },
     async printok () {
-      let msg = await this.$showMessage('已成功清零，是否进入发卡售气界面', ['confirm', 'cancel'])
+      let msg = await this.$showMessage('已成功清零,是否进入补气购气界面', ['confirm', 'cancel'])
       if (msg == 'confirm') {
         this.$dispatch('get-new-row', this.row)
       } else {

package/src/filiale/shaoguan/handListMaintain.vue

@@ -44,7 +44,7 @@
                 </div>
                 <div class="span" style="float:right;">
                   <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" progress="saleGetExportProgress" sql-name="handFiles"
                                 template-name='抄表记录'
@@ -307,7 +307,8 @@ const myMap = new Map()
         ],
         meterType: [{label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
         inputtores: [{label: '全部', value: ''}],
-        orgCondtionStr: ''
+        orgCondtionStr: '',
+        condValueStr: ''
       }
     },
     async ready () {
@@ -427,6 +428,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
       },
       mergeRowData (joinrows) {
 

package/src/filiale/tongchuan/MeterinfoTest.vue

@@ -293,8 +293,8 @@
                       condition="f_inputtor like '%{}%'" v-el:cc></v-select>
           </div>
           <div class="col-sm-4 form-group" >
-            <label for="f_usetype" class="font_normal_body" title="参数:使用类型">&ensp;壁&nbsp;挂&nbsp;炉&nbsp;</label>
-            <v-select :value.sync="row.f_usetype" v-model="row.f_usetype"
+            <label for="f_whether_bgl" class="font_normal_body" title="参数:使用类型">&ensp;壁&nbsp;挂&nbsp;炉&nbsp;</label>
+            <v-select :value.sync="row.f_whether_bgl" v-model="row.f_whether_bgl"
                       :options='usetype' placeholder='使用类型' @change="usetypechange"
                       close-on-select></v-select>
           </div>
@@ -487,10 +487,10 @@ let meterBookGen = function * (self) {
       usetypechange(){
         //如果选择壁挂锅炉
        let usertype = '';
-       if( this.meter.f_usetype instanceof  Array){
-         usertype = this.meter.f_usetype.length>0? this.meter.f_usetype[0]:''
+       if( this.meter.f_whether_bgl instanceof  Array){
+         usertype = this.meter.f_whether_bgl.length>0? this.meter.f_whether_bgl[0]:''
        }else{
-         usertype = this.meter.f_usetype? this.meter.f_usetype:''
+         usertype = this.meter.f_whether_bgl? this.meter.f_whether_bgl:''
        }
        if(usertype == '是'){
           this.$showAlert('请进行添加用气设备!','warning',3000);