apply-clients 3.3.108 → 3.3.109

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.3.108",
+  "version": "3.3.109",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/android/AppOnetomany.vue

@@ -165,7 +165,7 @@ export default {
   methods: {
     async confirmModal () {
       //报警器设备型号校验
-      if (this.selectdata.f_apply_type === '报警器报建') {
+      if (this.selectdata.f_apply_type === '报警器报建' || this.selectdata.f_apply_type === '工商业报警器报建') {
         let data = {
           f_material_name: "",
           f_bjq_sid: "",

package/src/components/android/AppServiceView.vue

@@ -439,7 +439,7 @@ export default {
       }
 
       //区域下拉框必选 流程模式为报警器报建
-      if (this.data.f_apply_type === '报警器报建' && this.data.defname === '工程施工' && this.data.title === '工程施工' && this.data.f_sub_state !='完工'){
+      if ((this.data.f_apply_type === '报警器报建' || this.data.f_apply_type === '工商业报警器报建') && this.data.defname === '工程施工' && this.data.title === '工程施工' && this.data.f_sub_state !='完工'){
         if (!flag){
           if (this.areaData.sjvalue ==null || this.areaData.sjvalue.length ==0 || this.areaData.sqvalue == null || this.areaData.sqvalue.length ==0
             || this.areaData.xianvalue == null || this.areaData.xianvalue == 0){

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

@@ -269,7 +269,7 @@ export default {
       showModal: false,
       applyType: '',  // 报建类型
       applyTypes:this.$appdata.getParam("手机报建类型"),
-      // applyTypes:[{label:'散户报建',value:'散户报建'},{label:'工商户报建',value:'工商户报建'},{label:'团购报建',value:'团购报建'},{label:'改管报建',value:'改管报建'},{label:'增容报建',value:'增容报建'},{label:'退款报建',value:'退款报建'},{label:'团购转散户',value:'团购转散户'},{label:'报警器报建',value:'报警器报建'}],
+      // applyTypes:[{label:'散户报建',value:'散户报建'},{label:'工商户报建',value:'工商户报建'},{label:'团购报建',value:'团购报建'},{label:'改管报建',value:'改管报建'},{label:'增容报建',value:'增容报建'},{label:'退款报建',value:'退款报建'},{label:'团购转散户',value:'团购转散户'},{label:'报警器报建',value:'报警器报建'},{label:'工商业报警器报建',value:'工商业报警器报建'}],
       criteriaShow: false,
     //  applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
       applytype: [{label: '全部', value: ''},  ...this.$appdata.getParam('报建类型') || [] ], // 所有报建类型
@@ -388,6 +388,9 @@ export default {
       }else if (this.applyType === '报警器报建') {
         data.processname = '报警器报建流程'
         data.defname = '报装申请'
+      }else if (this.applyType === '工商业报警器报建') {
+        data.processname = '工商业报警器报建流程'
+        data.defname = '报装申请'
       } else {
         this.$showMessage('暂无此类报装')
         return

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

@@ -553,7 +553,7 @@ export default {
     },
     async addressTips () {
       let res = ''
-      if (this.show_data.f_apply_type === '报警器报建') {
+      if (this.show_data.f_apply_type === '报警器报建' || this.show_data.f_apply_type === '工商业报警器报建') {
         res = await this.$showMessage('报警器报建下单后将不能修改用户信息，请确认用户信息地址等是否正确，如不完善可在档案中进行修正！！！')
       }else{
         res = await this.$showMessage('增容改管下单后将不能修改用户信息，请确认用户信息地址等是否正确，如不完善可在档案中进行修正！！！')
@@ -962,7 +962,7 @@ export default {
       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 !='完工' && this.show_data.button.button_name === '完工'){
+      if ((this.show_data.f_apply_type === '报警器报建' || this.show_data.f_apply_type === '工商业报警器报建') && this.show_data.defname === '工程施工' && this.show_data.f_sub_state !='完工' && this.show_data.button.button_name === '完工'){
         //判断是否添加报警器材料
         let bjqlag = false
         let datatemp = {
@@ -972,10 +972,21 @@ export default {
           'f_bjq_sid':"",
           'f_material_code':""
         }
+        let bjqststedata = {
+          "sid":"",
+          "bjqtype":"",
+          "f_process_id":"",
+          "bjqstate":""
+        }
         let numOne = [];
         this.show_data.onetomany.forEach(item=>{
           item.rows.forEach(i=>{
            if (i.f_material_name.substr(0,3) === '报警器'){
+             var bjname =  i.f_material_name.split("-")
+             bjqststedata.sid = i.f_bjq_sid
+             bjqststedata.f_process_id = i.f_process_id
+             bjqststedata.bjqtype = bjname[1]
+             //====================================
               bjqlag = true
               datatemp.bjqid = i.id
               datatemp.fprocessid = i.f_process_id
@@ -1000,42 +1011,69 @@ export default {
           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 bjqres = await this.$resetpost(
+          `rs/logic/getbjqsyncinfo`,
+          bjqststedata
         )
+        if (bjqres.data.bjqstate != "成功"){
+          //区域地址存入材料记录表
+          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_lng : datatemp.f_bjq_lng,
-          f_bjq_lat : datatemp.f_bjq_lat,
-          f_orgid : this.show_data.f_orgid,
-          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,
-        }
-        console.log('1111111111')
-        console.log(adddata)
+          // 完工之后推送数据到汉威
+          let adddata = {
+            f_bjq_sid : datatemp.f_bjq_sid,
+            f_material_code : datatemp.f_material_code,
+            f_bjq_lng : datatemp.f_bjq_lng,
+            f_bjq_lat : datatemp.f_bjq_lat,
+            f_orgid : this.show_data.f_orgid,
+            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`,
+            // `ncc/rs/logic/bjqadduser`,
+            //  `/rs/logic/bjqadduser`,
+            adddata
+          )
+          if (res.data.code != 200){
+            if (bjqres.data.bjqstate.length == 0){
+              bjqststedata.bjqstate  = "失败"
+              let bjqres3 = await this.$resetpost(
+                `rs/logic/addbjqsyncinfo`,
+                bjqststedata
+              )
+            }
+            this.$showMessage(res.data.msg)
+            return
+          }
 
-        let res = await this.$resetpost(
-          `${this.$androidUtil.getProxyUrl()}/ncc/rs/logic/bjqadduser`,
-          // `ncc/rs/logic/bjqadduser`,
-         //  `/rs/logic/bjqadduser`,
-          adddata
-        )
-        if (res.data.code != 200){
-          this.$showMessage(res.data.msg)
-          return
+          //更改记录表状态
+          if (bjqres.data.bjqstate === "失败"){
+            bjqststedata.bjqstate  = "成功"
+            let bjqres1 = await this.$resetpost(
+              `rs/logic/updatebjqsyncinfo`,
+              bjqststedata
+            )
+          }else{
+            bjqststedata.bjqstate  = "成功"
+            let bjqres2 = await this.$resetpost(
+              `rs/logic/addbjqsyncinfo`,
+              bjqststedata
+            )
+          }
         }
-
       }
       let res = await this.$resetpost(
         // `rs/logic/ApplyProductService`,