safecheck-client 3.0.30-62-t9 → 3.0.30-62-t10

package/src/filiale/bayan/android/PhoneUpUserinfo.vue

@@ -606,59 +606,6 @@ export default {
             }
           }
         }
-<<<<<<< HEAD
-        //tag
-        return checked
-      },
-      select_search(text) {
-        //tag
-        if (this.selectStreet.id) {
-          let pcdText = text ? `and f_street_id=${this.selectStreet.id} and f_residential_area like '%${text}%'` : `and f_street_id=${this.selectStreet.id}`
-          new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
-            data: {
-              items: "*",
-              tablename: "t_area",
-              orderitem: "id",
-              condition: `f_orgid = '${Vue.user.orgid}' ${pcdText} `
-            }
-          }, { resolveMsg: null, rejectMsg: null }).then((res) => {
-            //tag)
-            if (res.data.length > 0) {
-              this.area = []
-              res.data.forEach((result) => {
-                this.area.push({ label: result.f_residential_area, value: result })
-              })
-            }
-          })
-        } else {
-          this.area = []
-        }
-      },
-      cameraCallBack(prop, fileName) {
-        HostApp.__this__.$set(prop, fileName + '?' + Math.random())
-        //tag
-        HostApp.__callback__ = null
-        HostApp.__this__ = null
-      },
-      takePic(prop, title) {
-        HostApp.__callback__ = this.cameraCallBack
-        HostApp.__this__ = this
-        //tag
-        let fileName
-        if (!this[prop] || this[prop].includes("nopic.png")) {
-          fileName = Util.guid() + '-' + prop + '.jpg'
-        } else {
-          fileName = Util.getFileName(this[prop])
-        }
-        HostApp._open_a_page({
-          type: 'boomerang',
-          page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
-          param: {
-            file: fileName,
-            requestCode: 111,
-            callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");',
-            watermark: title + '\t时间：' + Util.toStandardTimeString() + '\t' + Vue.user.name
-=======
       }
       //tag
       return checked
@@ -681,7 +628,6 @@ export default {
             res.data.forEach((result) => {
               this.area.push({ label: result.f_residential_area, value: result })
             })
->>>>>>> v3
           }
         })
       } else {
@@ -713,68 +659,6 @@ export default {
           callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");',
           watermark: title + '\t时间：' + Util.toStandardTimeString() + '\t' + Vue.user.name
         }
-<<<<<<< HEAD
-      },
-      editUserInfoNoAudit() {
-        let checked = this.checkVal()
-        if (!checked.ischeck) {
-          this.$showMessage(checked.msg)
-          return
-        }
-        for (let i = 0; i < this.model.length; i++) {
-          this.model[i].f_user_id = this.userinfo.meterinfo[0].f_user_id
-        }
-        if (this.userphone[0].f_rent_phone) {
-          this.userinfo.baseinfo.base.f_rent_phone = this.userphone[0].f_rent_phone
-        }
-        this.$showMessage('确定是否修改上传用户信息？', ['confirm', 'cancel']).then((res) => {
-          if (res === 'confirm') {
-            this.excessive = true
-            let userinfoms = Object.assign({}, this.userinfo_old.baseinfo.base)
-            // userinfoms.f_user_name=row.f_user_name
-            userinfoms.f_user_phone = this.userinfo.baseinfo.base.f_user_phone
-            userinfoms.f_rent_name = this.userinfo.baseinfo.base.f_rent_name
-            userinfoms.f_zuhu_phone = this.userinfo.baseinfo.base.f_zuhu_phone
-            userinfoms.f_operator_record = Vue.user.name
-            userinfoms.f_operatorid_record = Vue.user.id
-            userinfoms.f_remark = this.userinfo.baseinfo.base.f_remark
-            userinfoms.f_orgid_record = Vue.user.orgid
-            userinfoms.f_orgname_record = Vue.user.orgs
-            userinfoms.f_depid_record = Vue.user.depids
-            userinfoms.f_depname_record = Vue.user.deps
-            this.userinfo_old.meterinfo[0].f_gas_person = this.userinfo.meterinfo[0].f_gas_person
-            this.userinfo_old.meterinfo[0].f_gas_date = this.userinfo.meterinfo[0].f_gas_date
-            this.userinfo_old.meterinfo[0].f_adjustable_id = this.userinfo.meterinfo[0].f_adjustable_id
-            this.userinfo_old.meterinfo[0].f_metertitles = this.userinfo.meterinfo[0].f_metertitles
-            this.userinfo_old.meterinfo[0].f_position = this.userinfo.meterinfo[0].f_position
-            this.userinfo_old.meterinfo[0].f_aroundmeter = this.userinfo.meterinfo[0].f_aroundmeter
-            this.userinfo_old.meterinfo[0].f_bqf_state = this.userinfo.meterinfo[0].f_bqf_state
-            this.userinfo_old.meterinfo[0].f_if_direct = this.userinfo.meterinfo[0].f_if_direct
-            userinfoms.userfiles = []
-            userinfoms.userphone = this.userphone
-            this.userinfo_old.meterinfo[0].devicesinfo = this.model
-            userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
-            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/filemanage_fileSave`, {
-              data: {
-                userinfo: userinfoms,
-                modifyReason: this.f_source ? `${this.f_source}维护档案信息` : '',
-                address: {
-                  id: this.userinfo_old.addressinfo.id,
-                  oldid: this.userinfo_old.addressinfo.id,
-                  f_address: this.userinfo.addressinfo.f_address ? this.userinfo.addressinfo.f_address : this.userinfo_old.addressinfo.f_address
-                }
-              }
-            }, { resolveMsg: null, rejectMsg: null }).then((res1) => {
-              if (res1.data.status == 200) {
-                let data = this.userinfo.addressinfo
-                data.f_address = this.userinfo.addressinfo.f_address ? this.userinfo.addressinfo.f_address : this.userinfo_old.addressinfo.f_address
-                //
-                data.f_operator = Vue.user.name
-                new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/address_updateuseraddress`, { data: data }).then((res2) => {
-                  this.$showMessage("修改用户地址信息成功！")
-                }).catch(error => {
-                  this.$showMessage("修改用户地址信息！")
-=======
       })
     },
     delfile(prop, fileName) {
@@ -947,7 +831,6 @@ export default {
                     changemeterno: this.changemeterno
                   },
                   tablename: 't_modify_userinfo'
->>>>>>> v3
                 })
                 //tag)
                 if (res2.code == 200) {
@@ -963,144 +846,11 @@ export default {
                 this.enable = true
                 this.excessive = false
               }
-<<<<<<< HEAD
-            }).catch((msg) => {
-              this.$showMessage("修改用户信息失败,请检查手机网络状况！")
-              this.excessive = false
-            })
-          }
-        })
-      },
-      editUserInfo() {
-        let checked = this.checkVal()
-        if (!checked.ischeck) {
-          this.$showMessage(checked.msg)
-          return
-        }
-
-        if (this.userphone[0].f_rent_phone) {
-          this.userinfo.baseinfo.base.f_rent_phone = this.userphone[0].f_rent_phone
-        }
-
-        this.$showMessage('确定是否修改上传审核用户信息？', ['confirm', 'cancel']).then((res) => {
-          if (res === 'confirm') {
-            this.excessive = true
-            let userinfoms = Object.assign({}, this.userinfo_old.baseinfo.base)
-            //userinfoms.f_user_name=row.f_user_name
-            userinfoms.f_user_phone = this.userinfo.baseinfo.base.f_user_phone
-            userinfoms.f_rent_name = this.userinfo.baseinfo.base.f_rent_name
-            userinfoms.f_zuhu_phone = this.userinfo.baseinfo.base.f_zuhu_phone
-            userinfoms.f_operator_record = Vue.user.name
-            userinfoms.f_operatorid_record = Vue.user.id
-            userinfoms.f_remark = this.userinfo.baseinfo.base.f_remark
-            userinfoms.f_orgid_record = Vue.user.orgid
-            userinfoms.f_orgname_record = Vue.user.orgs
-            userinfoms.f_depid_record = Vue.user.depids
-            userinfoms.f_depname_record = Vue.user.deps
-            this.userinfo_old.meterinfo[0].f_gas_person = this.userinfo.meterinfo[0].f_gas_person
-            this.userinfo_old.meterinfo[0].f_gas_date = this.userinfo.meterinfo[0].f_gas_date
-            this.userinfo_old.meterinfo[0].f_adjustable_id = this.userinfo.meterinfo[0].f_adjustable_id
-            this.userinfo_old.meterinfo[0].f_metertitles = this.userinfo.meterinfo[0].f_metertitles
-            this.userinfo_old.meterinfo[0].f_position = this.userinfo.meterinfo[0].f_position
-            this.userinfo_old.meterinfo[0].f_aroundmeter = this.userinfo.meterinfo[0].f_aroundmeter
-            this.userinfo_old.meterinfo[0].f_bqf_state = this.userinfo.meterinfo[0].f_bqf_state
-            this.userinfo_old.meterinfo[0].f_if_direct = this.userinfo.meterinfo[0].f_if_direct
-            userinfoms.userfiles = []
-            this.userinfo_old.meterinfo[0].devicesinfo = this.model
-            userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
-            userinfoms.userphone = this.userphone
-            //tag)
-            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/filemanage_fileSave`, {
-              data: {
-                userinfo: userinfoms,
-                modifyReason: this.f_source ? `${this.f_source}维护档案信息` : '',
-                address: { id: this.userinfo_old.addressinfo.id, oldid: this.userinfo_old.addressinfo.id }
-              }
-            }, { resolveMsg: null, rejectMsg: null }).then((res1) => {
-              //tag+res1.data.status)
-              if (res1.data.status == 200) {
-                //本次修改信息包含需要审核信息
-                if (this.approveChange) {
-                  //tag
-                  let res2 = this.$androidUtil.bzLogic('safe_upUserinfoApprove', {
-                    row: {
-                      f_time: Util.toStandardTimeString(),
-                      f_modifier: Vue.user.name,//Vue.user.name
-                      f_modifier_id: Vue.user.id,//Vue.user.id
-                      f_modify_type: '用户档案',
-                      f_userinfoid: this.userinfo.baseinfo.base.f_userinfo_id,
-                      f_userinfo_code: this.userinfo.baseinfo.base.f_userinfo_code,
-                      f_approved: '未审核',
-                      filialestr: Vue.user.orgid,//Vue.user.orgid
-                      version: 1,
-                      f_user_name: this.userinfo.baseinfo.base.f_user_name,
-                      f_user_phone: this.userinfo.baseinfo.base.f_user_phone,
-                      f_street: this.userinfo.addressinfo.f_street,
-                      f_building: this.userinfo.addressinfo.f_building,
-                      f_unit: this.userinfo.addressinfo.f_unit,
-                      f_floor: this.userinfo.addressinfo.f_floor,
-                      f_room: this.userinfo.addressinfo.f_room,
-                      f_building_suffix: this.userinfo.addressinfo.f_special == 1 ? null : this.userinfo.addressinfo.f_building_suffix,
-                      f_unit_suffix: this.userinfo.addressinfo.f_special == 1 ? null : this.userinfo.addressinfo.f_unit_suffix,
-                      f_floor_suffix: this.userinfo.addressinfo.f_special == 1 ? null : this.userinfo.addressinfo.f_floor_suffix,
-                      f_room_suffix: this.userinfo.addressinfo.f_special == 1 ? null : this.userinfo.addressinfo.f_room_suffix,
-                      f_residential_area: this.userinfo.addressinfo.f_residential_area,
-                      f_address: this.userinfo.addressinfo.f_address,
-                      f_pcd: this.userinfo.addressinfo.f_pcd,
-                      f_pcd_id: this.userinfo.addressinfo.f_pcd_id,
-                      f_street_id: this.userinfo.addressinfo.f_street_id,
-                      f_residential_area_id: this.userinfo.addressinfo.f_residential_area_id,
-                      f_used_name: this.userinfo.baseinfo.base.f_used_name,
-                      f_rent_phone: this.userinfo.baseinfo.base.f_rent_phone,
-                      f_slice_area: this.userinfo.addressinfo.f_slice_area,
-                      f_remark: this.userinfo.baseinfo.base.f_remark,
-                      f_source: this.f_source,
-                      f_meterno_path: this.f_meterno_path,
-                      f_iscity: this.userinfo.addressinfo.f_iscity,
-                      f_special: this.userinfo.addressinfo.f_special,
-                      f_meternumber: this.userinfo.meterinfo[0].f_meternumber,
-                      changemeterno: this.changemeterno
-                    },
-                    tablename: 't_modify_userinfo'
-                  })
-                  //tag)
-                  if (res2.code == 200) {
-                    this.$showMessage("变更用户信息成功,需要审核的信息已提交审核，等待管理员处理！")
-                    this.enable = true
-                    this.excessive = false
-                  } else {
-                    this.$showMessage("上传审核信息失败，请检查图片和网络状况是否正常！")
-                    this.excessive = false
-                  }
-                } else {
-                  this.$showMessage("修改用户信息成功！")
-                  this.enable = true
-                  this.excessive = false
-                }
-
-              }
-            }).catch((msg) => {
-              this.$showMessage("修改用户信息失败,请检查手机网络状况！")
-              this.excessive = false
-            })
-
-          }
-        })
-      },
-      imgback(header) {
-        if (this.headername == header) {
-          return require('../../../assets/xiangxia1.png')
-        } else {
-          return require('../../../assets/xiangyou1.png')
-=======
-
             }
           }).catch((msg) => {
             this.$showMessage("修改用户信息失败,请检查手机网络状况！")
             this.excessive = false
           })
-
->>>>>>> v3
         }
       })
     },
@@ -1118,155 +868,6 @@ export default {
       } else {
         this.headername = header
       }
-
-<<<<<<< HEAD
-      },
-      changeNewAddress() {
-        this.userinfo.addressinfo.f_address = this.addressType == '普通地址' ? this.getAddress : this.getAddressTS
-      },
-      area_change() {
-        //tag
-        this.userinfo.addressinfo.f_residential_area = this.selectArea.f_residential_area
-        this.userinfo.addressinfo.f_residential_area_id = this.selectArea.id
-        this.userinfo.addressinfo.f_slice_area = this.selectArea.f_slice_area
-        this.changeNewAddress()
-        //this.userinfo.addressinfo.f_residential_area=this.f_residential_area.f_residential_area
-      },
-      async street_change() {
-        //tag
-        if (this.selectStreet.id) {
-          //如果街道改变--给街道赋值！
-          this.userinfo.addressinfo.f_street = this.selectStreet.f_street
-          this.userinfo.addressinfo.f_street_id = this.selectStreet.id
-          this.userinfo.addressinfo.f_iscity = this.selectStreet.f_iscity
-          //清空当前选中小区的值
-          this.userinfo.addressinfo.f_residential_area = ''
-          this.userinfo.addressinfo.f_residential_area_id = ''
-          this.userinfo.addressinfo.f_slice_area = ''
-          this.selectArea = { id: '' }
-          this.area = []
-          let pcdText = ` and f_street_id=${this.selectStreet.id}`
-          let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
-            data: {
-              items: "*",
-              tablename: "t_area",
-              orderitem: "id",
-              condition: `f_orgid = '${Vue.user.orgid}' ${pcdText} `
-            }
-          }, { resolveMsg: null, rejectMsg: null })
-          ////tag)
-          res.data.forEach((result) => {
-            this.area.push({ label: result.f_residential_area, value: result })
-          })
-        } else {
-          this.area = []
-        }
-
-        this.changeNewAddress()
-      },
-      async pcd_change() {
-        //tag
-        if (this.selectPcd.id) {
-          //tag
-          //如果省市区改变-重新赋值
-          this.userinfo.addressinfo.f_pcd = this.selectPcd.f_pcd
-          this.userinfo.addressinfo.f_pcd_id = this.selectPcd.id
-          //清空 选中的街道和集收单位
-          this.selectStreet = { id: '' }
-          this.userinfo.addressinfo.f_street = ''
-          this.userinfo.addressinfo.f_street_id = ''
-          this.userinfo.addressinfo.f_iscity = ''
-          this.selectArea = { id: '' }
-          this.userinfo.addressinfo.f_residential_area = ''
-          this.userinfo.addressinfo.f_residential_area_id = ''
-          this.userinfo.addressinfo.f_slice_area = ''
-          this.streets = []
-          let pcdText = `and f_pcd_id=${this.selectPcd.id}`
-          let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
-            data: {
-              items: "*",
-              tablename: "t_street",
-              orderitem: "id",
-              condition: `f_orgid = '${Vue.user.orgid}' ${pcdText}`
-            }
-          }, { resolveMsg: null, rejectMsg: null })
-          streetlist.data.forEach((result) => {
-            this.streets.push({ label: result.f_street, value: result })
-          })
-        } else {
-          this.streets = []
-        }
-        this.changeNewAddress()
-      },
-      upUserState() {
-        //tag)
-        if (this.userinfo.meterinfo[0].f_table_state == '正常') {
-          let data = {
-            f_userfiles_id: {
-              f_userfiles_id: this.userinfo.meterinfo[0].f_userfiles_id,
-              f_table_state: '停用',
-              version: this.userinfo.meterinfo[0].version
-            },
-            f_userfile_id: this.userinfo.meterinfo[0].f_userfiles_id,
-            f_user_id: this.userinfo.meterinfo[0].f_user_id,
-            f_userinfo_id: this.userinfo.meterinfo[0].f_userinfo_id,
-            f_user_name: this.userinfo.baseinfo.base.f_user_name,
-            f_comments: '安检时发现问题关闭阀门',
-            f_othereason: '',
-            f_operat_type: '停用',
-            f_describe: `${Vue.user.name}对客户${this.userinfo.baseinfo.base.f_user_name}进行表具停用操作`,
-            f_state: '有效',
-            f_operator: Vue.user.name,//${Vue.$login.f.name}
-            f_operatorid: Vue.user.id,
-            f_orgid: Vue.user.orgid,
-            f_orgname: Vue.user.orgs,
-            f_depid: Vue.user.depids,
-            f_depname: Vue.user.deps,
-            f_zoneid: Vue.user.zoneid,
-            f_zones: Vue.user.zones
-          }
-          new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/entity/t_disable`,
-            data, { resolveMsg: null, rejectMsg: null }).then((row) => {
-            this.$showMessage('已成功关阀停气！')
-            this.userinfo.meterinfo[0].f_table_state = '停用'
-          })
-        } else {
-          this.$showMessage('该用户已被关阀停用，请勿重复操作！')
-        }
-
-      },
-      addDevices() {
-        //Vue.user.name
-        let obj = {
-          "f_operator": Vue.user.name,
-          "f_picture": null,
-          "f_pipe_type": null,
-          "f_pipeinstall_date": null,
-          "f_pipe_connection": null,
-          "f_expire_date": null,
-          "f_pipeexpire_date": null,
-          "f_comments": null,
-          "f_operate_date": Util.toStandardTimeString(),
-          "f_operatorid": Vue.user.id,
-          "f_devices_num": null,
-          "f_process_id": null,
-          "f_devices_type": null,
-          "f_make_date": null,
-          "f_input_date": null,
-          "f_state": "有效",
-          "f_brand": null,
-          "f_devices_model": null,
-          "f_devices_no": null,
-          "img": { "content": null, "filename": null }
-        }
-        this.model.push(obj)
-      },
-      delDevices(idx) {
-        //tag
-        this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
-          if (res === 'confirm') {
-            this.model.splice(idx, 1)
-=======
     },
     changeNewAddress() {
       this.userinfo.addressinfo.f_address = this.addressType == '普通地址' ? this.getAddress : this.getAddressTS
@@ -1299,129 +900,15 @@ export default {
             tablename: "t_area",
             orderitem: "id",
             condition: `f_orgid = '${Vue.user.orgid}' ${pcdText} `
->>>>>>> v3
           }
         }, { resolveMsg: null, rejectMsg: null })
         ////tag)
         res.data.forEach((result) => {
           this.area.push({ label: result.f_residential_area, value: result })
         })
-<<<<<<< HEAD
-      },
-      async getAreaList(text) {
-        if (this.selectStreet.id) {
-          this.area = []
-          let pcdText = text ? `and f_street_id=${this.selectStreet.id} and f_residential_area like '%${text}%'` : `and f_street_id=${this.selectStreet.id}`
-          let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
-            data: {
-              items: "*",
-              tablename: "t_area",
-              orderitem: "id",
-              condition: `f_orgid = '${Vue.user.orgid}' ${pcdText}`
-            }
-          }, { resolveMsg: null, rejectMsg: null })
-          ////tag)
-          res.data.forEach((result) => {
-            this.area.push({ label: result.f_residential_area, value: result })
-          })
-          //tag
-          this.area.push({
-            label: this.userinfo.addressinfo.f_residential_area,
-            value: {
-              id: this.userinfo.addressinfo.f_residential_area_id,
-              f_residential_area: this.userinfo.addressinfo.f_residential_area
-            }
-          })
-        } else {
-          this.area = []
-        }
-
-      },
-      async getStreetList() {
-        if (this.selectPcd.id) {
-          //tag
-          this.streets = []
-          let pcdText = `and f_pcd_id=${this.selectPcd.id}`
-          let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
-            data: {
-              items: "*",
-              tablename: "t_street",
-              orderitem: "id",
-              condition: `f_orgid = '${Vue.user.orgid}' ${pcdText}`
-            }
-          }, { resolveMsg: null, rejectMsg: null })
-          streetlist.data.forEach((result) => {
-            //如果第一次进来有地址id 就拿下地址区域
-            if (this.selectStreet.id && this.selectStreet.id == result.id) {
-              //tag)
-              this.userinfo.addressinfo.f_iscity = result.f_iscity
-            }
-            this.streets.push({ label: result.f_street, value: result })
-          })
-        } else {
-          this.streets = []
-        }
-      },
-      async confirmLimitGas() {
-        this.$dispatch('limit', this.models);
-        console.log('提交限购数据', this.models);
-        let restrict = {
-          f_third_pay: this.models.f_third_pay,
-          f_time_type: this.models.f_time_type,
-          f_limit_times: this.models.f_limit_times,
-          f_time_value: this.models.f_time_value,
-          f_limit_type: this.models.f_limit_type,
-          f_limit_style: this.models.f_limit_style,
-          f_limit_value: this.models.f_limit_value,
-          f_limit_amount: this.models.f_limit_amount,
-          f_operator: Vue.user.name,
-          f_status: this.models.f_status,
-          f_start_date: this.$login.toStandardDateString()
-        };
-        let operInfo = {
-          f_operator: Vue.user.name,
-          f_operatorid: Vue.user.id,
-          f_orgid: Vue.user.orgid,
-          f_orgname: Vue.user.orgs,
-          f_depid: Vue.user.depids,
-          f_depname: Vue.user.deps,
-        };
-        let user = {
-          f_userinfo_id: this.f_userinfo_id,
-          f_user_name: this.f_user_name,
-          f_userfiles_id: this.userinfo.meterinfo[0].f_userfiles_id,
-          f_table_state: this.userinfo.meterinfo[0].f_table_state,
-          f_user_id: this.userinfo.meterinfo[0].f_user_id,
-        };
-        let param = {
-          restrict,
-          user,
-          operInfo
-        };
-        console.log('提交限购数据', JSON.stringify(param));
-        let http = new HttpResetClass();
-        await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/limitGas`, {
-          data: param
-        });
-      },
-      changeAddressType(val) {
-        //tag
-        if (this.addressType == '普通地址') {
-          this.userinfo.addressinfo.f_special = null
-        } else if (this.addressType == '特殊地址') {
-          this.userinfo.addressinfo.f_special = 1
-          this.userinfo.addressinfo.f_building = null
-          this.userinfo.addressinfo.f_unit = null
-          this.userinfo.addressinfo.f_floor = null
-          this.userinfo.addressinfo.f_room = null
-        }
-        this.changeNewAddress()
-=======
       } else {
         this.area = []
->>>>>>> v3
       }
-
       this.changeNewAddress()
     },
     async pcd_change() {
@@ -1460,77 +947,6 @@ export default {
     },
     upUserState() {
       //tag)
-<<<<<<< HEAD
-      //tag)*/
-      //this.f_userinfo_id=1102260
-      //this.f_userinfo_id=1997541
-      if (!this.f_userinfo_id) {
-        this.$showMessage("未检测到用户！")
-        this.enable = true
-        return
-      }
-      try {
-
-        this.devices_types = Vue.$appdata.getParam('设备类型')
-        console.log('this.devices_types=', JSON.stringify(this.devices_types))
-        for (const devices_type of this.devices_types) {
-          console.log('Vue.$appdata.getParam(`档案设备信息-${devices_type.label}品牌`)=', JSON.stringify(Vue.$appdata.getParam(`档案设备信息-${devices_type.label}品牌`)))
-          this.deviceBrandOption[devices_type.label] = Vue.$appdata.getParam(`档案设备信息-${devices_type.label}品牌`) || []
-        }
-        console.log('this.deviceBrandOption=', JSON.stringify(this.deviceBrandOption))
-        this.wz_types = Vue.$appdata.getParam('安装位置')
-        this.aroundmeters = Vue.$appdata.getParam('左右表')
-
-        ////tag)
-        this.excessive = true
-        //Vue.user.orgid ${this.f_userinfo_id} 10101    ${Vue.user.orgid}
-
-        let pcdlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
-          data: {
-            items: "*",
-            tablename: "t_pcd",
-            orderitem: "id",
-            condition: `f_orgid = '${Vue.user.orgid}'`
-          }
-        }, { resolveMsg: null, rejectMsg: null })
-        //tag)
-        pcdlist.data.forEach((result) => {
-          this.pcds.push({ label: result.f_pcd, value: result })
-        })
-        ////tag)
-        let res = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/filemanage_getFilesDetail`, {
-          //f_userinfo_code:'12381344',
-          f_userinfo_id: this.f_userinfo_id
-        }, { resolveMsg: null, rejectMsg: null })
-        //tag
-        //tag
-        this.userinfo = res.data
-        this.userinfo_old = JSON.parse(JSON.stringify(res.data))
-        this.model = this.userinfo.meterinfo[0].devicesinfo
-        this.selectArea.id = this.userinfo.addressinfo.f_residential_area_id
-        this.selectPcd.id = this.userinfo.addressinfo.f_pcd_id
-        this.selectPcd.f_pcd = this.userinfo.addressinfo.f_pcd
-        this.selectStreet.id = this.userinfo.addressinfo.f_street_id
-        this.selectStreet.f_street = this.userinfo.addressinfo.f_street
-        await this.getStreetList()
-        await this.getAreaList()
-        this.excessive = false
-        this.addressType = this.userinfo.addressinfo.f_special == 1 ? '特殊地址' : '普通地址'
-        //this.userinfo.addressinfo.f_special=1
-        //tag
-        let userphone = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
-          data: {
-            items: "*",
-            tablename: "t_user_phone",
-            orderitem: "id",
-            condition: `f_userinfo_id = '${this.f_userinfo_id}' and f_state = '有效'`
-          }
-        }, { resolveMsg: null, rejectMsg: null })
-        let tempObj = {
-          id: null,
-          f_userinfo_id: this.f_userinfo_id,
-          f_rent_phone: '',
-=======
       if (this.userinfo.meterinfo[0].f_table_state == '正常') {
         let data = {
           f_userfiles_id: {
@@ -1546,7 +962,6 @@ export default {
           f_othereason: '',
           f_operat_type: '停用',
           f_describe: `${Vue.user.name}对客户${this.userinfo.baseinfo.base.f_user_name}进行表具停用操作`,
->>>>>>> v3
           f_state: '有效',
           f_operator: Vue.user.name,//${Vue.$login.f.name}
           f_operatorid: Vue.user.id,
@@ -1884,31 +1299,6 @@ export default {
       }).catch((msg) => {
         //tag)
       })
-<<<<<<< HEAD
-      this.showBox = this.$appdata.getSingleValue('档案审核是否显示调压箱') == '是' ? true : false
-      console.log(this.showBox)
-      if (this.showBox) {
-        // 获取调压箱
-        new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/adjustableboxQuery`, { data: { condition: '1 = 1' } }, {
-          resolveMsg: null,
-          rejectMsg: null
-        }).then((res) => {
-          const boxOptions = []
-          for (const data of res.data) {
-            const one = {
-              label: data.f_adjustable_id + data.f_adjustable_name,
-              value: Number(data.f_adjustable_id)
-            }
-            boxOptions.push(one)
-          }
-          this.boxOptions = JSON.parse(JSON.stringify(boxOptions))
-          console.log(this.boxOptions)
-        }).catch((msg) => {
-          //tag)
-        })
-      }
-=======
->>>>>>> v3
     }
   }
 }