apply-clients 3.3.79 → 3.3.84

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

@@ -448,7 +448,7 @@ export default {
       //this.$getConfig(this, 'UserAddress')
       //获取地址配置文件
       try {
-        let res = await new HttpResetClass().load('get',`${this.$androidUtil.getProxyUrl()}/rs/vue/UserAddress.json`,{resolveMsg: null, rejectMsg: null})
+        let res = await new HttpResetClass().load('get',`${this.$androidUtil.getProxyUrl()}/rs/vue/UserAddress.json`,null,{resolveMsg: null, rejectMsg: null})
         Object.assign(this.config, res.data)
       } catch (error) {
         console.log("未获取到地址信息")
@@ -956,6 +956,69 @@ export default {
       this.show_data.start_activity = this.json_datas.start_activity
       this.show_data.xmlfilename = this.json_datas.workflow_xmlfilename
 
+
+      if (this.show_data.f_apply_type === '报警器报建' && this.show_data.defname === '工程施工' && this.show_data.f_sub_state !='完工'){
+        //判断是否添加报警器材料
+        let bjqlag = false
+        let datatemp = {
+          'bjqid':"",
+          'fprocessid':"",
+          'sqvalue':"",
+          'f_bjq_sid':"",
+          'f_material_code':""
+        }
+        let numOne = [];
+        this.show_data.onetomany.forEach(item=>{
+          item.rows.forEach(i=>{
+            if (i.f_material_name.substr(0,3) === '报警器'){
+              bjqlag = true
+              datatemp.bjqid = i.id
+              datatemp.fprocessid = i.f_process_id
+              datatemp.f_bjq_sid = i.f_bjq_sid
+              datatemp.f_material_code = i.f_material_code
+              numOne.push(i.f_bjq_sid)
+            }
+          })
+        })
+        if (!bjqlag){
+          this.$showMessage('请添加报警器物料信息!!!')
+          return
+        }
+        if (numOne.length > 1){
+          this.$showMessage("暂时支持单个报警器物料安装!!!")
+          return
+        }
+        datatemp.sqvalue = this.show_data.areaData.sqvalue
+        //区域地址存入材料记录表
+        let areares = await this.$resetpost(
+          `${this.$androidUtil.getProxyUrl()}/rs/logic/saveArea`,
+          // `rs/logic/saveArea`,
+          {data: datatemp},
+          {resolveMsg: null, rejectMsg: '区域地址保存失败'}
+        )
+
+        // 完工之后推送数据到汉威
+        let adddata = {
+          f_bjq_sid : datatemp.f_bjq_sid,
+          f_material_code : datatemp.f_material_code,
+          f_bjq_address: this.show_data.areaData.sqvalue,
+          f_user_name: this.show_data.f_user_name,
+          f_address: this.show_data.f_address,
+          f_user_phone: this.show_data.f_phone,
+          f_userinfo_code: this.show_data.f_userinfo_code,
+          installtime: this.show_data.f_construction_date,
+        }
+        let res = await this.$resetpost(
+          `${this.$androidUtil.getProxyUrl()}/ncc/rs/logic/bjqadduser`,
+          // `/rs/logic/bjqadduser`,
+          adddata
+        )
+        if (res.data.code != 200){
+          this.$showMessage(res.data.msg)
+          return
+        }
+
+      }
       let res = await this.$resetpost(
         // `rs/logic/ApplyProductService`,
         `${this.$androidUtil.getProxyUrl()}/rs/logic/ApplyProductService`,