apply-clients 3.3.72 → 3.3.75

package/src/components/android/Process/AppServiceControl.vue

@@ -62,7 +62,6 @@ export default {
       )
 
       this.json_datas = res.data
-      // this.json_datas = {"start_activity":"报装申请","workflow_xmlfilename":"散户报建流程","activitys":[{"title":"报装申请","tables":["t_apply"],"fields":[{"label":"工程名称","type":"input","field":"f_entry_name","readonly":false,"disabled":false,"required":true},{"label":"报建类型","type":"select","field":"f_apply_type","readonly":true,"required":true,"disabled":true,"placeholder":"请选择","param":true,"options":[]},{"label":"用户名称","type":"input","field":"f_user_name","readonly":false,"disabled":false,"required":true},{"label":"用户电话","type":"tel","field":"f_phone","readonly":false,"disabled":false,"required":true},{"label":"证件类型","type":"select","field":"f_credentials","readonly":false,"required":true,"disabled":false,"placeholder":"请选择","param":true,"options":[{"label":"身份证","value":"身份证"},{"label":"营业执照","value":"营业执照"}]},{"label":"证件号码","type":"input","field":"f_idnumber","readonly":false,"required":true,"disabled":false},{"label":"片区","type":"select","field":"f_slice_area","readonly":false,"required":true,"disabled":false,"ready":"getSliceArea","options":[]},{"label":"地址类型","type":"select","field":"f_address_type","readonly":false,"required":true,"disabled":false,"onchange":"addressTypeChange","options":[{"label":"民用城区","value":"民用城区"},{"label":"民用农村","value":"民用农村"},{"label":"特殊城区","value":"特殊城区"},{"label":"特殊农村","value":"特殊农村"}]},{"label":"区/县","type":"select","field":"f_pcd","hidden":true,"readonly":false,"required":true,"disabled":false,"ready":"getPcd","onchange":"pcdChange","options":[]},{"label":"街道","type":"select","field":"f_street","hidden":true,"readonly":false,"required":true,"disabled":false,"onchange":"streetChange","options":[]},{"label":"小区","type":"select","field":"f_residential_area","hidden":true,"readonly":false,"required":true,"disabled":false,"options":[]},{"label":"楼号(乡/镇)","type":"input","field":"f_building","hidden":true,"readonly":false,"required":false,"disabled":false},{"label":"单元(村)","type":"input","field":"f_unit","hidden":true,"readonly":false,"required":false,"disabled":false},{"label":"楼层(组)","type":"input","field":"f_floor","hidden":true,"readonly":false,"required":false,"disabled":false},{"label":"门牌号(号)","type":"input","field":"f_room","hidden":true,"readonly":false,"required":false,"disabled":false},{"label":"地址","type":"textarea","field":"f_address","rows":1,"readonly":false,"required":true,"disabled":false},{"label":"预约地址","type":"textarea","field":"f_order_address","rows":1,"readonly":true,"required":false,"disabled":false},{"label":"备注","type":"textarea","field":"f_apply_remarks","rows":2,"readonly":false,"required":false,"disabled":false}],"components":[],"buttons":[{"button_name":"保存"},{"button_name":"勘察","disabled":true},{"button_name":"合同","disabled":true}],"readyEvent":"applyReadyEvent"},{"title":"勘察派工","tables":["t_apply"],"fields":[{"label":"工程名称","type":"input","field":"f_entry_name","readonly":true,"disabled":false,"required":true},{"label":"工程编号","type":"input","field":"f_apply_num","readonly":true,"disabled":false,"required":true},{"label":"报建类型","type":"input","field":"f_apply_type","readonly":true,"required":true,"disabled":false},{"label":"用户编号","type":"input","field":"f_userinfo_code","readonly":true,"disabled":false,"required":true},{"label":"用户名称","type":"input","field":"f_user_name","readonly":true,"disabled":false,"required":true},{"label":"用户电话","type":"tel","field":"f_phone","readonly":true,"disabled":false,"required":true},{"label":"证件类型","type":"input","field":"f_credentials","readonly":true,"required":true,"disabled":false},{"label":"证件号码","type":"input","field":"f_idnumber","readonly":true,"required":true,"disabled":false},{"label":"地址","type":"textarea","field":"f_address","rows":1,"readonly":true,"required":true,"disabled":false}],"components":[],"buttons":[{"button_name":"保存"},{"button_name":"下发","source":"this.getParentByType($organization$).getChildByName($市场部报装$).getChildren()","button_fields":[{"label":"下发给","type":"select","field":"f_issue_man","placeholder":"请输入","readonly":false,"disabled":false,"required":true,"options":[]}],"disabled":true}]},{"title":"现场勘察","tables":["t_apply"],"fields":[{"label":"工程名称","type":"input","field":"f_entry_name","readonly":true,"disabled":false,"required":true},{"label":"工程编号","type":"input","field":"f_apply_num","readonly":true,"disabled":false,"required":true},{"label":"报建类型","type":"input","field":"f_apply_type","readonly":true,"required":true,"disabled":false},{"label":"用户编号","type":"input","field":"f_userinfo_code","readonly":true,"disabled":false,"required":true},{"label":"用户名称","type":"input","field":"f_user_name","readonly":true,"disabled":false,"required":true},{"label":"用户电话","type":"tel","field":"f_phone","readonly":true,"disabled":false,"required":true},{"label":"证件类型","type":"input","field":"f_credentials","readonly":true,"required":true,"disabled":false},{"label":"证件号码","type":"input","field":"f_idnumber","readonly":true,"required":true,"disabled":false},{"label":"地址","type":"textarea","field":"f_address","rows":1,"readonly":true,"required":true,"disabled":false},{"label":"勘查结果","type":"textarea","field":"f_prospecting_result","rows":2,"readonly":false,"required":true,"disabled":false}],"components":[],"buttons":[{"button_name":"保存"},{"button_name":"提交","disabled":true}]},{"title":"合同签订","tables":["t_apply"],"fields":[{"label":"工程名称","type":"input","field":"f_entry_name","readonly":true,"disabled":false,"required":true},{"label":"工程编号","type":"input","field":"f_apply_num","readonly":true,"disabled":false,"required":true},{"label":"报建类型","type":"input","field":"f_apply_type","readonly":true,"required":true,"disabled":false},{"label":"用户编号","type":"input","field":"f_userinfo_code","readonly":true,"disabled":false,"required":true},{"label":"用户名称","type":"input","field":"f_user_name","readonly":true,"disabled":false,"required":true},{"label":"用户电话","type":"tel","field":"f_phone","readonly":true,"disabled":false,"required":true},{"label":"证件类型","type":"input","field":"f_credentials","readonly":true,"required":true,"disabled":false},{"label":"证件号码","type":"input","field":"f_idnumber","readonly":true,"required":true,"disabled":false},{"label":"地址","type":"textarea","field":"f_address","rows":1,"readonly":true,"required":true,"disabled":false},{"label":"合同编号","type":"input","field":"f_contract_number","prefix":"","suffix":null,"placeholder":"请输入","readonly":true,"required":true,"default":"this.selectdata.f_apply_num","eval":true},{"label":"合同金额","type":"number","field":"f_contract_money","placeholder":"0.00","readonly":false,"required":true,"onchange":"contractMoneyChange"},{"label":"追加金额","type":"number","field":"f_add_contract_money","placeholder":"请输入","readonly":true,"required":true,"default":0},{"label":"应交金额","type":"number","field":"f_due_money","placeholder":"请输入","readonly":true,"required":true,"default":0},{"label":"合同签订时间","type":"datepicker","field":"f_contract_date","placeholder":"请选择","readonly":false,"required":true}],"components":[{"title":"补充协议","device":"pc","name":"supplemental-agreement"},{"title":"补充协议","device":"app","name":"app-supplemental-agreement"}],"buttons":[{"button_name":"保存"},{"button_name":"提交","disabled":true}]},{"title":"报装缴费","tables":["t_apply"],"fields":[{"label":"工程名称","type":"input","field":"f_entry_name","readonly":true,"disabled":false,"required":true},{"label":"工程编号","type":"input","field":"f_apply_num","readonly":true,"disabled":false,"required":true},{"label":"报建类型","type":"input","field":"f_apply_type","readonly":true,"required":true,"disabled":false},{"label":"用户编号","type":"input","field":"f_userinfo_code","readonly":true,"disabled":false,"required":true},{"label":"用户名称","type":"input","field":"f_user_name","readonly":true,"disabled":false,"required":true},{"label":"用户电话","type":"tel","field":"f_phone","readonly":true,"disabled":false,"required":true},{"label":"证件类型","type":"input","field":"f_credentials","readonly":true,"required":true,"disabled":false},{"label":"证件号码","type":"input","field":"f_idnumber","readonly":true,"required":true,"disabled":false},{"label":"地址","type":"textarea","field":"f_address","rows":2,"readonly":true,"required":true,"disabled":false},{"label":"合同编号","type":"input","field":"f_contract_number","placeholder":"","readonly":true,"required":true},{"label":"合同金额","type":"number","field":"f_contract_money","placeholder":"请输入","readonly":true,"required":true},{"label":"追加款","type":"number","field":"f_add_contract_money","placeholder":"请输入","readonly":true,"required":false},{"label":"应交金额","type":"number","field":"f_due_money","placeholder":"请输入","readonly":true,"required":false},{"label":"累计缴费金额","type":"number","field":"f_cumulative_payment_money","placeholder":"请输入","readonly":true,"required":false},{"label":"未结总金额","type":"number","field":"f_surplus_money","placeholder":"请输入","readonly":true,"required":false},{"label":"付款比例","type":"input","field":"f_payment_ratio","placeholder":"请输入","readonly":true,"required":false},{"label":"累计退款金额","type":"number","field":"f_cumulative_retreat_money","placeholder":"请输入","readonly":true,"required":false,"default":0}],"components":[{"title":"缴费明细","device":"pc","name":"apply-charge-management"},{"title":"补充协议","device":"pc","name":"supplemental-agreement","mark":1},{"title":"缴费明细","device":"app","name":"app-charge-management"},{"title":"补充协议","device":"app","name":"app-supplemental-agreement","mark":1}],"buttons":[{"button_name":"保存"},{"before":"chargeBefore","button_name":"提交","disabled":true}]},{"title":"工程派工","tables":["t_apply"],"fields":[{"label":"工程名称","type":"input","field":"f_entry_name","readonly":true,"disabled":false,"required":true},{"label":"工程编号","type":"input","field":"f_apply_num","readonly":true,"disabled":false,"required":true},{"label":"报建类型","type":"input","field":"f_apply_type","readonly":true,"required":true,"disabled":false},{"label":"用户编号","type":"input","field":"f_userinfo_code","readonly":true,"disabled":false,"required":true},{"label":"用户名称","type":"input","field":"f_user_name","readonly":true,"disabled":false,"required":true},{"label":"用户电话","type":"tel","field":"f_phone","readonly":true,"disabled":false,"required":true},{"label":"证件类型","type":"input","field":"f_credentials","readonly":true,"required":true,"disabled":false},{"label":"证件号码","type":"input","field":"f_idnumber","readonly":true,"required":true,"disabled":false},{"label":"地址","type":"textarea","field":"f_address","rows":1,"readonly":true,"required":true,"disabled":false}],"buttons":[{"button_name":"保存"},{"button_name":"下发","source":"this.getParentByType($organization$).getChildByName($工程部报装$).getChildren()","button_fields":[{"label":"下发给","type":"select","field":"f_issue_man","placeholder":"请输入","readonly":false,"disabled":false,"required":true,"options":[]}],"disabled":true}]},{"title":"工程施工","tables":["t_apply"],"fields":[{"label":"工程名称","type":"input","field":"f_entry_name","readonly":true,"disabled":false,"required":true},{"label":"工程编号","type":"input","field":"f_apply_num","readonly":true,"disabled":false,"required":true},{"label":"报建类型","type":"input","field":"f_apply_type","readonly":true,"required":true,"disabled":false},{"label":"用户编号","type":"input","field":"f_userinfo_code","readonly":true,"disabled":false,"required":true},{"label":"用户名称","type":"input","field":"f_user_name","readonly":true,"disabled":false,"required":true},{"label":"用户电话","type":"tel","field":"f_phone","readonly":true,"disabled":false,"required":true},{"label":"证件类型","type":"input","field":"f_credentials","readonly":true,"required":true,"disabled":false},{"label":"证件号码","type":"input","field":"f_idnumber","readonly":true,"required":true,"disabled":false},{"label":"地址","type":"textarea","field":"f_address","rows":2,"readonly":true,"required":true,"disabled":false},{"label":"施工单位","type":"input","field":"f_construction_unit","readonly":false,"required":true,"disabled":false,"default":"this.$login.f.name","eval":true},{"label":"施工安装时间","type":"datepicker","field":"f_construction_date","readonly":false,"required":true,"disabled":false},{"bootstraped":"col-sm-12 col-xs-12","label":"安装项目","type":"checkbox","field":"f_install_project","readonly":false,"required":true,"disabled":false,"param":false,"options":[{"label":"入户","value":"入户"},{"label":"热水器","value":"热水器"},{"label":"壁挂炉","value":"壁挂炉"}]},{"label":"施工安装情况","type":"textarea","field":"f_install_situation","rows":2,"readonly":false,"required":true,"disabled":false},{"label":"施工备注","type":"textarea","field":"f_construction_remarks","rows":2,"readonly":false,"required":false,"disabled":false}],"onetomany":[{"title":"材料明细","hidden":false,"tables":["t_material_list"],"hiddenOperate":false,"modalSize":"large","addHidden":false,"addStyle":null,"deleteHidden":false,"deleteText":"删除","deleteMessage":null,"updateHidden":false,"updateText":"修改","fields":[{"label":"材料名称","type":"input","field":"f_material_name","placeholder":"请输入","readonly":false,"required":true},{"label":"材料型号","type":"input","field":"f_material_style","placeholder":"请输入","readonly":false,"required":true},{"label":"材料价格","type":"number","field":"f_material_price","placeholder":"请输入","readonly":false,"required":true},{"label":"材料单位","type":"input","field":"f_material_unit","placeholder":"请输入","readonly":false,"required":true},{"label":"材料数量","type":"number","field":"f_material_number","placeholder":"请输入","readonly":false,"required":true},{"label":"材料备注","type":"input","field":"f_material_remarks","placeholder":"请输入","readonly":false,"required":false}]}],"components":[{"title":"安装明细","device":"pc","name":"installation-details"},{"title":"安装明细","device":"app","name":"app-installation-details"},{"title":"用气设备","device":"pc","name":"apply-devices-management"},{"title":"用气设备","device":"app","name":"app-apply-devices-management"}],"buttons":[{"button_name":"保存"},{"before":"constructionBefore","button_name":"提交","disabled":true}]},{"title":"点火派单","tables":["t_apply"],"fields":[{"label":"工程名称","type":"input","field":"f_entry_name","readonly":true,"disabled":false,"required":true},{"label":"工程编号","type":"input","field":"f_apply_num","readonly":true,"disabled":false,"required":true},{"label":"报建类型","type":"input","field":"f_apply_type","readonly":true,"required":true,"disabled":false},{"label":"用户编号","type":"input","field":"f_userinfo_code","readonly":true,"disabled":false,"required":true},{"label":"用户名称","type":"input","field":"f_user_name","readonly":true,"disabled":false,"required":true},{"label":"用户电话","type":"tel","field":"f_phone","readonly":true,"disabled":false,"required":true},{"label":"证件类型","type":"input","field":"f_credentials","readonly":true,"required":true,"disabled":false},{"label":"证件号码","type":"input","field":"f_idnumber","readonly":true,"required":true,"disabled":false},{"label":"地址","type":"textarea","field":"f_address","rows":1,"readonly":true,"required":true,"disabled":false},{"label":"施工单位","type":"input","field":"f_construction_unit","readonly":true,"required":true,"disabled":false},{"label":"施工安装时间","type":"datepicker","field":"f_construction_date","readonly":true,"required":true,"disabled":true},{"bootstraped":"col-sm-12 col-xs-12","label":"安装项目","type":"checkbox","field":"f_install_project","readonly":true,"required":true,"disabled":true,"param":false,"options":[{"label":"入户","value":"入户"},{"label":"热水器","value":"热水器"},{"label":"壁挂炉","value":"壁挂炉"}]},{"label":"施工安装情况","type":"textarea","field":"f_install_situation","rows":2,"readonly":true,"required":true,"disabled":false},{"label":"施工备注","type":"textarea","field":"f_construction_remarks","rows":2,"readonly":true,"required":false,"disabled":false}],"components":[],"buttons":[{"button_name":"保存"},{"button_name":"下发","source":"this.getParentByType($organization$).getChildByName($运营部报装$).getChildren()","button_fields":[{"label":"下发给","type":"select","field":"f_issue_man","placeholder":"请输入","readonly":false,"disabled":false,"required":true,"options":[]}],"disabled":true}]},{"title":"通气点火","tables":["t_apply"],"fields":[{"label":"工程名称","type":"input","field":"f_entry_name","readonly":true,"disabled":false,"required":true},{"label":"工程编号","type":"input","field":"f_apply_num","readonly":true,"disabled":false,"required":true},{"label":"报建类型","type":"input","field":"f_apply_type","readonly":true,"required":true,"disabled":false},{"label":"用户编号","type":"input","field":"f_userinfo_code","readonly":true,"disabled":false,"required":true},{"label":"用户名称","type":"input","field":"f_user_name","readonly":true,"disabled":false,"required":true},{"label":"用户电话","type":"tel","field":"f_phone","readonly":true,"disabled":false,"required":true},{"label":"证件类型","type":"input","field":"f_credentials","readonly":true,"required":true,"disabled":false},{"label":"证件号码","type":"input","field":"f_idnumber","readonly":true,"required":true,"disabled":false},{"label":"地址","type":"textarea","field":"f_address","rows":1,"readonly":true,"required":true,"disabled":false},{"label":"施工单位","type":"input","field":"f_construction_unit","readonly":true,"required":true,"disabled":false},{"label":"施工安装时间","type":"datepicker","field":"f_construction_date","readonly":true,"required":true,"disabled":true},{"bootstraped":"col-sm-12 col-xs-12","label":"安装项目","type":"checkbox","field":"f_install_project","readonly":true,"required":true,"disabled":true,"param":true},{"label":"施工安装情况","type":"textarea","field":"f_install_situation","rows":2,"readonly":true,"required":true,"disabled":false},{"label":"施工备注","type":"textarea","field":"f_construction_remarks","rows":2,"readonly":true,"required":false,"disabled":false},{"label":"点火人","type":"input","field":"f_igniter_people","readonly":true,"required":true,"disabled":false,"default":"this.$login.f.name","eval":true},{"label":"通气时间","type":"datepicker","field":"f_ventilate_date","readonly":true,"required":true,"disabled":true,"default":true},{"label":"通气情况","type":"textarea","field":"f_gas_result","readonly":false,"required":true,"disabled":true,"rows":"7","default":"客户如认可以下内容请签字，如有不认可之处请说明情况\n1、气密性检测合格，已对各接口处进行查漏无泄漏\n2、燃气表运转正常并告知用户。灶具点火测试正常。使用金属波纹管\n3、已向用户讲解安全常识及注意事项。发放《用户使用手册》并张贴提示标签\n4、灶具品牌                                                     油烟机品牌\n5、热水器品牌                                                  壁挂炉品牌\n6、金属波纹品牌。"},{"label":"通气备注","type":"textarea","field":"f_gas_result","readonly":false,"required":false,"disabled":false},{"label":"是否购买保险","type":"select","field":"f_is_insure","placeholder":"请输入","readonly":false,"disabled":false,"required":true,"options":[{"label":"是","value":"是"},{"label":"否","value":"否"}],"default":"是","onchange":"isInsureChange"},{"label":"保费开始日期","type":"datepicker","field":"f_ins_start_date","readonly":false,"required":true,"disabled":false,"default":true,"format":"yyyy-MM-dd","hidden":true},{"label":"保费结束日期","type":"datepicker","field":"f_ins_expiration_date","readonly":false,"required":true,"disabled":false,"hidden":true},{"label":"险种","type":"select","field":"f_insurance_type","readonly":false,"disabled":false,"required":true,"options":[],"param":true,"hidden":true},{"label":"保费金额","type":"number","field":"f_insurance_money","placeholder":"请输入","readonly":false,"required":true,"hidden":true},{"label":"保险备注","type":"textarea","field":"f_ins_comments","rows":2,"readonly":false,"required":false,"disabled":false,"hidden":true}],"components":[{"title":"安装明细","device":"pc","name":"installation-details"},{"title":"安装明细","device":"app","name":"app-installation-details"},{"title":"用气设备","device":"pc","name":"apply-devices-management"},{"title":"用气设备","device":"app","name":"app-apply-devices-management"}],"buttons":[{"button_name":"保存"},{"button_name":"提交","disabled":true}],"readyEvent":"gasReadyEvent"},{"title":"完工","tables":["t_apply"],"fields":[{"label":"完工","type":"input","field":"f_successful","disabled":true,"value":"---success---"}]}]}
 
       let sum = 0
       let jsonData = {}
@@ -138,7 +137,7 @@ export default {
               }
             }
           }
-
+          console.log("item.ready"+item.ready)
           if (item.ready) {
             item.options = await this[item.ready]()
           }
@@ -388,6 +387,130 @@ export default {
         }
       }
     },
+    async streetChange () {
+      if (isEmpty(this.show_data.f_street)) {
+        return
+      }
+
+      let data = {
+        tablename: 't_area',
+        condition: `f_filialeid = '${this.$login.f.orgid}' and f_street = '${this.show_data.f_street}'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
+      )
+
+      this.setLabelOptions('集收单位', res.data.map(item => {
+        return {
+          label: item.f_residential_area,
+          value: item.f_residential_area
+        }
+      }))
+    },
+    async pcdChange () {
+      if (isEmpty(this.show_data.f_pcd)) {
+        return
+      }
+
+      let data = {
+        tablename: 't_street',
+        condition: `f_filialeid = '${this.$login.f.orgid}' and f_pcd = '${this.show_data.f_pcd}'`
+      }
+      let f_address_type = this.getLableValue('地址类型')
+
+      if (f_address_type === '民用市区') {
+        data.condition = `f_filialeid = '${this.$login.f.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '市区'`
+      }
+      if (f_address_type === '民用乡镇') {
+        data.condition = `f_filialeid = '${this.$login.f.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '乡镇'`
+      }
+
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '街道/乡镇查询失败！！！'}
+      )
+
+      this.setLabelOptions('街道/乡镇', res.data.map(item => {
+        return {
+          label: item.f_street,
+          value: item.f_street
+        }
+      }))
+    },
+    async addressInitialization () {
+      //this.$getConfig(this, 'UserAddress')
+      //获取地址配置文件
+      try {
+        let res = await new HttpResetClass().load('get',`${this.$androidUtil.getProxyUrl()}/rs/vue/UserAddress.json`,{resolveMsg: null, rejectMsg: null})
+        Object.assign(this.config, res.data)
+      } catch (error) {
+        console.log("未获取到地址信息")
+      }
+      console.log("???????????不走了吗！")
+      let f_address_type = this.show_data.f_address_type
+
+      for (const item of this.show_data.fields) {
+        if (f_address_type === '民用市区') {
+          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
+            item.hidden = false
+            item.required = true
+          }
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
+            item.hidden = false
+            item.required = false
+          }
+          if (item.label === '地址') {
+            item.readonly = true
+          }
+        }
+        if (f_address_type === '民用乡镇') {
+          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
+            item.hidden = false
+            item.required = true
+          }
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
+            item.hidden = false
+            item.required = false
+          }
+          if (item.label === '楼层') {
+            item.hidden = true
+            item.required = false
+          }
+          if (item.label === '地址') {
+            item.readonly = true
+          }
+        }
+        if (f_address_type === '特殊地址') {
+          if (item.label === '区/县' || item.label === '街道/乡镇') {
+            item.hidden = false
+            item.required = true
+          }
+          if (item.label === '集收单位') {
+            item.hidden = false
+            item.required = false
+          }
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层' || item.label === '门牌号') {
+            item.hidden = true
+            item.required = false
+          }
+          if (item.label === '地址') {
+            item.readonly = false
+          }
+        }
+
+        if (this.show_data.f_apply_source === '线下发起' && item.label === '预约地址') {
+          item.hidden = true
+        }
+      }
+    },
+
     async checkDuplicate(index) {
       let http = new HttpResetClass()
       let data = {
@@ -529,7 +652,92 @@ export default {
       this.$dispatch('loadPage')
 
       throw '终止报建！！！'
+    },
+    async getDevInfo () {
+      let data = {
+        tablename: 't_dev_info',
+        condition: `f_orgid = '${Vue.user.orgid}'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '公司查询失败！！！'}
+      )
+
+      return res.data.map(item => {
+        return {
+          label: item.f_dev_name,
+          value: item.f_dev_name
+        }
+      })
+    },
+    async getDesignerPeople () {
+      let data = {
+        source: 'this.getParentByType($organization$).getChildByName($设计部报装$).getChildren()',
+        userid: Vue.user.id
+      }
+
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/search`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '设计人员查询失败！！！'}
+      )
+
+      return res.data.map(item => {
+        return {
+          label: item.name,
+          value: item.id
+        }
+      })
+    },
+    // 获取片区
+    async getSliceArea () {
+      let data = {
+        source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+        userid: Vue.user.id
+      }
+
+      let http = new HttpResetClass()
+      let res = await http.load(
+              'POST',
+              `${this.$androidUtil.getProxyUrl()}/rs/search`,
+              {data: data},
+              {resolveMsg: null, rejectMsg: '片区查询失败！！！'}
+      )
+
+      return res.data.map(item => {
+        return {
+          label: item.name,
+          value: item.name
+        }
+      })
+    },
+    // 获取区县
+    async getPcd () {
+      let data = {
+        tablename: 't_pcd',
+        condition: `f_filialeid = '${Vue.user.orgid}'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+              'POST',
+              `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
+              {data: data},
+              {resolveMsg: null, rejectMsg: '区县查询失败！！！'}
+      )
+
+      return res.data.map(item => {
+        return {
+          label: item.f_pcd,
+          value: item.f_pcd
+        }
+      })
     }
+
   },
   events: {
     'complyInstallation' (index) {
@@ -758,29 +966,32 @@ export default {
     'onchange' (index) {
       if (this.show_data.defname === '报装申请') {
         if (
-          this.show_data.fields[index].label === '街道' ||
-          this.show_data.fields[index].label === '小区' ||
-          this.show_data.fields[index].label === '楼号(乡/镇)' ||
-          this.show_data.fields[index].label === '单元(村)' ||
-          this.show_data.fields[index].label === '楼层(组)' ||
-          this.show_data.fields[index].label === '门牌号(号)'
+          this.show_data.fields[index].label === '区/县' ||
+          this.show_data.fields[index].label === '街道/乡镇' ||
+          this.show_data.fields[index].label === '集收单位' ||
+          this.show_data.fields[index].label === '楼号/组' ||
+          this.show_data.fields[index].label === '单元/排' ||
+          this.show_data.fields[index].label === '楼层' ||
+          this.show_data.fields[index].label === '门牌号'
         ) {
 
-          let f_street = this.getLableValue('街道')
-          let f_residential_area = this.getLableValue('小区')
-          let f_building = this.getLableValue('楼号(乡/镇)')
+          let f_pcd = this.getLableValue('区/县') || ''
+          let f_street = this.getLableValue('街道/乡镇') || ''
+          let f_residential_area = this.getLableValue('集收单位') || ''
+          let f_building = this.getLableValue('楼号/组') || ''
           let f_building_suffix = f_building ? this.config.f_building_suffix : ''
-          let f_unit = this.getLableValue('单元(村)')
+          let f_unit = this.getLableValue('单元/排') || ''
           let f_unit_suffix = f_unit ? this.config.f_unit_suffix : ''
-          let f_floor = this.getLableValue('楼层(组)')
+          let f_floor = this.getLableValue('楼层') || ''
           let f_floor_suffix = f_floor ? this.config.f_floor_suffix : ''
-          let f_room = this.getLableValue('门牌号(号)')
+          let f_room = this.getLableValue('门牌号') || ''
           let f_room_suffix = f_room ? this.config.f_room_suffix : ''
 
           let f_address = null
 
           let f_address_type = this.show_data.f_address_type
-          if (f_address_type === '民用城区') {
+          f_address = f_pcd + f_street + f_residential_area + f_building + f_building_suffix + f_unit + f_unit_suffix + f_floor + f_floor_suffix + f_room + f_room_suffix
+          /*if (f_address_type === '民用城区') {
             f_address = f_street + f_residential_area + f_building + f_building_suffix + f_unit + f_unit_suffix + f_floor + f_floor_suffix + f_room + f_room_suffix
           }
           if (f_address_type === '民用农村') {
@@ -788,11 +999,265 @@ export default {
           }
           if (f_address_type === '特殊城区') {
             f_address = f_street + f_residential_area
-          }
+          }*/
           this.setLabelValue("地址", f_address)
         }
       }
     },
+    async getDesignerPeople () {
+      let data = {
+        source: 'this.getParentByType($organization$).getChildByName($设计部报装$).getChildren()',
+        userid: this.$login.f.id
+      }
+
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/search`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '设计人员查询失败！！！'}
+      )
+
+      return res.data.map(item => {
+        return {
+          label: item.name,
+          value: item.id
+        }
+      })
+    },
+    // 申请节点初始化
+    'applyReadyEvent' () {
+      this.addressInitialization()
+
+      this.pcdChange()
+      this.streetChange()
+    },
+    // 合同金额失去焦点
+    async 'contractMoneyChange' (index) {
+      let data = {
+        operator: '+',
+        num1: this.show_data.f_contract_money || 0,
+        num2: this.getLableValue('追加金额') || 0
+      }
+      let res = await this.$resetpost(
+              `${this.$androidUtil.getProxyUrl()}/rs/logic/compute`,
+              {data: data},
+              {resolveMsg: null, rejectMsg: '金额计算失败！！！'}
+      )
+
+      this.setLabelValue('应交金额', res.data)
+    },
+    // 街道失去焦点
+    async 'streetChange' (index) {
+      if (isEmpty(this.show_data.f_street)) {
+        return
+      }
+
+      this.setLabelValue('集收单位', null)
+
+      let data = {
+        tablename: 't_area',
+        condition: `f_filialeid = '${Vue.user.orgid}' and f_street = '${this.show_data.f_street}'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+              'POST',
+              `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
+              {data: data},
+              {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
+      )
+
+      this.setLabelOptions('集收单位', res.data.map(item => {
+        return {
+          label: item.f_residential_area,
+          value: item.f_residential_area
+        }
+      }))
+    },
+    // 选择报建项目
+    'selectApply' (row) {
+      this.setLabelValue('工程名称', row.f_entry_name)
+      this.setLabelValue('工程编号', row.f_apply_num)
+      this.setLabelValue('报建类型', row.f_apply_type)
+      this.setLabelValue('用户名称', row.f_user_name)
+      this.setLabelValue('用户电话', row.f_phone)
+      this.setLabelValue('证件类型', row.f_credentials)
+      this.setLabelValue('证件号码', row.f_idnumber)
+      this.setLabelValue('地址', row.f_address)
+      this.setLabelValue('累计缴费金额', row.f_cumulative_payment_money)
+
+      this.show_data.parentApply = JSON.parse(JSON.stringify(row))
+
+      delete row.id
+      delete row.actid
+      delete row.defid
+      delete row.defname
+      delete row.version
+      delete row.f_apply_num
+      delete row.f_sub_state
+      delete row.f_apply_type
+      delete row.f_process_id
+
+      this.show_data = Object.assign({}, this.show_data, row)
+
+      this.show_data.f_parent_process_id = this.show_data.parentApply.f_process_id
+    },
+    // 区县失去焦点
+    async 'pcdChange' (index) {
+      if (isEmpty(this.show_data.f_pcd)) {
+        return
+      }
+
+      this.setLabelValue('街道/乡镇', null)
+      this.setLabelValue('集收单位', null)
+
+
+
+      let data = {
+        tablename: 't_street',
+        condition: `f_filialeid = '${Vue.user.orgid}' and f_pcd = '${this.show_data.f_pcd}'`
+      }
+      let f_address_type = this.getLableValue('地址类型')
+
+      if (f_address_type === '民用市区') {
+        data.condition = `f_filialeid = '${Vue.user.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '市区'`
+      }
+      if (f_address_type === '民用乡镇') {
+        data.condition = `f_filialeid = '${Vue.user.f.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '乡镇'`
+      }
+
+      let http = new HttpResetClass()
+      let res = await http.load(
+              'POST',
+              `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
+              {data: data},
+              {resolveMsg: null, rejectMsg: '街道/乡镇查询失败！！！'}
+      )
+
+      this.setLabelOptions('街道/乡镇', res.data.map(item => {
+        return {
+          label: item.f_street,
+          value: item.f_street
+        }
+      }))
+    },
+    // 选择用户档案信息
+    'selectUserinfo' (row) {
+      this.setLabelValue('用户编号', row.f_userinfo_code)
+      this.setLabelValue('用户名称', row.f_user_name)
+      this.setLabelValue('用户电话', row.f_user_phone)
+      this.setLabelValue('证件类型', row.f_credentials)
+      this.setLabelValue('证件号码', row.f_idnumber)
+      this.setLabelValue('地址', row.f_address)
+
+      this.show_data.f_userinfo_id = row.f_userinfo_id
+      this.show_data.f_userinfo_code = row.f_userinfo_code
+    },
+    // 地址类型失去焦点
+    'addressTypeChange' (index) {
+      this.setLabelValue('街道/乡镇', null)
+      this.setLabelValue('集收单位', null)
+      let f_address_type = this.show_data.fields[index].value
+      for (const item of this.show_data.fields) {
+        if (f_address_type === '民用市区') {
+          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
+            item.hidden = false
+            item.required = true
+            item.value = null
+          }
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
+            item.hidden = false
+            item.required = false
+            item.value = null
+          }
+          if (item.label === '地址') {
+            item.readonly = true
+            item.value = null
+          }
+        }
+        if (f_address_type === '民用乡镇') {
+          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
+            item.hidden = false
+            item.required = true
+            item.value = null
+          }
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
+            item.hidden = false
+            item.required = false
+            item.value = null
+          }
+          if (item.label === '楼层') {
+            item.hidden = true
+            item.required = false
+            item.value = null
+          }
+          if (item.label === '地址') {
+            item.readonly = true
+            item.value = null
+          }
+        }
+        if (f_address_type === '特殊地址') {
+          if (item.label === '区/县' || item.label === '街道/乡镇') {
+            item.hidden = false
+            item.required = true
+            item.value = null
+          }
+          if (item.label === '集收单位') {
+            item.hidden = false
+            item.required = false
+            item.value = null
+          }
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层' || item.label === '门牌号') {
+            item.hidden = true
+            item.required = false
+            item.value = null
+          }
+          if (item.label === '地址') {
+            item.readonly = false
+            item.value = null
+          }
+        }
+      }
+    },
+    // 搜索小区
+    async 'searchArea' (area, index) {
+      let data = {
+        tablename: 't_area',
+        condition: `f_filialeid = '${Vue.user.orgid}' and f_street = '${this.show_data.f_street}' and f_residential_area like '%${area}%'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+              'POST',
+              `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
+              {data: data},
+              {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
+      )
+
+      if (res.data.length === 0) {
+        return
+      }
+
+      this.setLabelOptions('集收单位', res.data.map(item => {
+        return {
+          label: item.f_residential_area,
+          value: item.f_residential_area
+        }
+      }))
+    },
+    // 团购转散户初始化
+    'apply2ReadyEvent' () {
+      if (this.show_data.f_apply_source === '线下发起') {
+        this.addressInitialization()
+        this.hideLabels('用户编号')
+        this.electiveLabels('用户编号')
+        this.showLabels('片区', '地址类型')
+        this.requiredLabels('片区', '地址类型')
+      }
+      if (this.show_data.f_apply_source === '自动发起') {
+        this.hideLabels('片区', '地址类型')
+        this.electiveLabels('片区', '地址类型',)
+      }
+    },
     'onblur' (index) {},
     'oninput' (index) {},
     'initializtionView' () {},

package/src/components/android/Process/Processes/AppChargeManagement.vue

@@ -342,7 +342,7 @@ export default {
       let http = new HttpResetClass()
       let data = {}
       let url = null
-      if (this.selectdata.f_apply_type === '改管报建' || this.selectdata.f_apply_type === '增容报建') {
+      if (this.selectdata.f_apply_type === '改管报建' || this.selectdata.f_apply_type === '增容报建' || this.selectdata.f_apply_type === '报警器报建') {
         data = {
           condition: `ui.f_userinfo_id = ${this.selectdata.f_userinfo_id}`
         }

package/src/components/android/Process/Processes/AppInstallationDetails.vue

@@ -389,7 +389,7 @@ export default {
         condition: `ua.f_process_id = '${this.selectdata.f_process_id}'`
       }
 
-      if (this.selectdata.f_apply_type === '团购转散户' || this.selectdata.f_apply_type === '改管报建' || this.selectdata.f_apply_type === '增容报建') {
+      if (this.selectdata.f_apply_type === '团购转散户' || this.selectdata.f_apply_type === '改管报建' || this.selectdata.f_apply_type === '增容报建' || this.selectdata.f_apply_type === '报警器报建') {
         data.condition = `ui.f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
       }
       let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/getAddresAndUserinfoAndUserfilesAmount`, {data:data}, {