safecheck-client 4.0.0-7 → 4.0.0-70

package/src/components/android/BlackUserOnLine.vue

@@ -178,7 +178,7 @@ export default {
           orderitem: "f_userinfo_id"
         }
       }, {resolveMsg: null, rejectMsg: null})
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
         data: {
           "f_operat_type": "取消拉黑",
           "f_state": "有效",
@@ -223,7 +223,7 @@ export default {
           orderitem: "f_userinfo_id"
         }
       }, {resolveMsg: null, rejectMsg: null})
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
         data: {
           "f_operat_type": "拉黑",
           "f_state": "有效",

package/src/components/android/Insurance/PhoneInsurancePurchase.vue

@@ -41,7 +41,7 @@
               </div>
               <div class="col-xs-7">
                 <input type="text" class="form-control" v-model="model.f_address" placeholder="请输入客户地址"
-                       condition="f_address like '%{}%'" />
+                       condition="ads.f_address like '%{}%'" />
               </div>
             </div>
             <div class="row text-center app-row">

package/src/components/android/Insurance/PhoneInsurancePurchaseDetail.vue

@@ -165,14 +165,15 @@ export default {
   ready() {
     new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
       data: {
-          items: '*',
-          tablename: 't_userinfo',
-          condition: `f_userinfo_id  = '${this.model.f_userinfo_id}'`,
+        items: 'tu.*,uf.f_userfiles_id',
+        tablename: 't_userinfo tu left join t_userfiles uf on tu.f_userinfo_id = uf.f_userinfo_id',
+        condition: `tu.f_userinfo_id  = '${this.model.f_userinfo_id}' and uf.f_table_state in ('停用','正常')`,
         orderitem: '1'
       }
     }).then(response => {
       this.model = Object.assign({}, this.model, response.data[0])
       this.model.f_last_insexpiration_date = response.data[0].f_ins_stop_date
+      this.model.f_total_ins_charge = response.data[0].f_total_ins_charge || 0
     })
     this.model.f_money = ''
     this.model.f_fee_type = ''
@@ -202,7 +203,6 @@ export default {
       }
         let commit_data = this.model
         commit_data.f_buy_date = this.create_date
-        commit_data.f_total_ins_charge = ''
         commit_data.f_operatorid = Vue.user.id
         commit_data.f_operator = Vue.user.name
         commit_data.f_operate_date = Util.toStandardDateString()

package/src/components/android/PaperFeedback.vue

@@ -1219,6 +1219,8 @@ export default {
         this.paper.f_blacklist = "否"
         this.$showMessage("取消该用户限制购气成功！")
       } else {
+        this.showmodelthree = false
+        this.deleteenabled = true
         this.$showMessage("网络异常，请稍后再试！")
       }
     },
@@ -1249,7 +1251,7 @@ export default {
         limit_value = Vue.config.safecheck.ApproveConfig.limit_value
         limit_amount = Vue.config.safecheck.ApproveConfig.limit_amount
       }
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
+      http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
         data: {
           data:this.$parent.$parent.data,
           item:this.$parent.$parent.data.item,
@@ -1273,21 +1275,21 @@ export default {
           "f_limit_amount":limit_amount,
           'f_limit_type':'气量'
         }
-      }, {resolveMsg: null, rejectMsg: null})
-
-      ////tag)
-      if (res2.data.code == 200) {
+      }, {resolveMsg: null, rejectMsg: null}).then(res2=>{
         this.showmodel = false
         this.enabled = true
         this.paper.f_blacklist = "是"
         this.$showMessage("将该用户限制购气成功！")
-      } else if (res2.data.msg == '数据增加重复') {
-        this.showmodel = false
-        this.enabled = true
-        this.$showMessage("该用户已被限制购气，请勿重复提交！")
-      } else {
-        this.$showMessage("网络异常，请稍后再试！")
-      }
+      }).catch(error=>{
+        if (error.status== 601){
+          this.showmodel = false
+          this.enabled = true
+          this.paper.f_blacklist = "是"
+          this.$showMessage("该用户已被限制购气，请勿重复提交！")
+        }else {
+          this.$showMessage("网络异常，请稍后再试！")
+        }
+      })
     },
     cancel() {
       this.backlistisselect = false

package/src/components/android/PaperFeedbackTemp.vue

@@ -1143,7 +1143,7 @@
         }, {resolveMsg: null, rejectMsg: null})
         ////tag)
         ////tag
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
           data: {
             "f_operat_type": "取消拉黑",
             "f_state": "有效",
@@ -1201,7 +1201,7 @@
           limit_times = Vue.config.safecheck.ApproveConfig.limit_times
           limit_value = Vue.config.safecheck.ApproveConfig.limit_value
         }
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
           data: {
             data:this.$parent.$parent.data,
             item:this.$parent.$parent.data.item,

package/src/components/android/PhoneUpUserinfo.vue

@@ -630,6 +630,16 @@
             userinfoms.f_orgname_record = Vue.user.orgs
             userinfoms.f_depid_record = Vue.user.depids
             userinfoms.f_depname_record = Vue.user.deps
+            this.userinfo_old.baseinfo.base.f_idnumber = this.userinfo.baseinfo.base.f_idnumber
+            this.userinfo_old.baseinfo.base.f_user_phone = this.userinfo.baseinfo.base.f_user_phone
+            this.userinfo_old.baseinfo.base.f_rent_name = this.userinfo.baseinfo.base.f_rent_name
+            this.userinfo_old.baseinfo.base.f_zuhu_phone = this.userinfo.baseinfo.base.f_zuhu_phone
+            this.userinfo_old.addressinfo.f_iscity = this.userinfo.addressinfo.f_iscity
+            this.userinfo_old.addressinfo.f_building = this.userinfo.addressinfo.f_building
+            this.userinfo_old.addressinfo.f_unit = this.userinfo.addressinfo.f_unit
+            this.userinfo_old.addressinfo.f_floor = this.userinfo.addressinfo.f_floor
+            this.userinfo_old.addressinfo.f_room = this.userinfo.addressinfo.f_room
+            this.userinfo_old.addressinfo.f_address = this.userinfo.addressinfo.f_address
             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
@@ -694,6 +704,16 @@
             userinfoms.f_orgname_record = Vue.user.orgs
             userinfoms.f_depid_record = Vue.user.depids
             userinfoms.f_depname_record = Vue.user.deps
+            this.userinfo_old.baseinfo.base.f_idnumber = this.userinfo.baseinfo.base.f_idnumber
+            this.userinfo_old.baseinfo.base.f_user_phone = this.userinfo.baseinfo.base.f_user_phone
+            this.userinfo_old.baseinfo.base.f_rent_name = this.userinfo.baseinfo.base.f_rent_name
+            this.userinfo_old.baseinfo.base.f_zuhu_phone = this.userinfo.baseinfo.base.f_zuhu_phone
+            this.userinfo_old.addressinfo.f_iscity = this.userinfo.addressinfo.f_iscity
+            this.userinfo_old.addressinfo.f_building = this.userinfo.addressinfo.f_building
+            this.userinfo_old.addressinfo.f_unit = this.userinfo.addressinfo.f_unit
+            this.userinfo_old.addressinfo.f_floor = this.userinfo.addressinfo.f_floor
+            this.userinfo_old.addressinfo.f_room = this.userinfo.addressinfo.f_room
+            this.userinfo_old.addressinfo.f_address = this.userinfo.addressinfo.f_address
             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

package/src/components/android/RelieveRestrict.vue

@@ -258,7 +258,7 @@ export default {
           f_limit_value: res.data[0].f_limit_value
         }
       })
-      await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, data, {resolveMsg: `${type}成功`, rejectMsg: `${type}失败，请重试`}).then(res => {
+      await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, data, {resolveMsg: `${type}成功`, rejectMsg: `${type}失败，请重试`}).then(res => {
         if (res.data.code === 200) {
           this.message = '解除限购成功!!!'
         } else {

package/src/components/android/Restriction.vue

@@ -306,7 +306,7 @@ export default {
           f_limit_value: type == '限购'? this.xgGis: ''
         }
       })
-      await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, data, {resolveMsg: `${type}成功`, rejectMsg: `${type}失败，请重试`}).then(res => {
+      await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, data, {resolveMsg: `${type}成功`, rejectMsg: `${type}失败，请重试`}).then(res => {
         if (res.data.code === 200) {
           this.message = `${type}成功!!!`
         } else {

package/src/components/android/SafecheckDevices.vue

@@ -154,6 +154,9 @@
                           </div>
                           <img v-show="row.f_path" src="../../assets/remove.png" :class="style__"   @click="delfile(idxs, row.f_path)" v-if="role!='androidview'" style="width: 40px;height: 40px;position: absolute;left:110px;top:110px"></img>
                         </div>
+                        <button v-if="isalbum" style="float: right" type="button" name="button" class="btn btn-primary btn-photo"
+                                @click="takePic2(idxs, row.f_item_name)">相册
+                        </button>
                       </div>
                     </div>
                   </div>
@@ -170,6 +173,9 @@
                           </div>
                           <img v-show="row['f_p' + (itemIndex+1)+'_path']" src="../../assets/remove.png" :class="style__"   @click="delfile(idxs,row['f_p' + (itemIndex+1)+'_path'],'f_p' + (itemIndex+1)+ '_path')" v-if="role!='androidview'" style="width: 40px;height: 40px;position: absolute;left:110px;top:110px"></img>
                         </div >
+                        <button v-if="isalbum" style="float: right" type="button" name="button" class="btn btn-primary btn-photo"
+                                @click="takePic2(idxs, row.f_item_name,'f_p' + (itemIndex+1)+ '_path')">相册
+                        </button>
                       </div>
                     </div>
                   </div>
@@ -302,7 +308,8 @@ export default {
       )(this),
       showElse:false, //控制其他选项是否显示
       showXCImg: false, //  是否显示现场整改拍照选项
-      showZXTime: false //  是否显示自行整改处理时效
+      showZXTime: false, //  是否显示自行整改处理时效
+      isalbum:this.$appdata.getSingleValue('安检使用相册') || false,
     }
   },
   props: ['config','device','idx','operation','role'],
@@ -356,6 +363,7 @@ export default {
     },
     changdeal(val){
       if(val == undefined){
+        this.f_items[this.selectindex].f_deal_dispose = ''
         return
       }
       if(this.selectindex != null) {
@@ -466,6 +474,41 @@ export default {
         param: {file: fileName, requestCode: 111, callback:'javascript:HostApp.__callback__("'+ prop +'","'+ title +'", "%s","'+pathname+'");', watermark: title + '\t时间：'+ Util.toStandardTimeString() + '\t' + Vue.user.name + jingweidu}
       })
     },
+    takePic2(prop, title, pathname='null') {
+      if (this.role == 'androidview') {
+        return
+      }
+      HostApp.__callback__ = this.cameraCallBack
+      HostApp.__this__ = this
+      //tag
+      let fileName
+      if (pathname == 'null') {
+        if (!this.f_items[prop].f_path || this.f_items[prop].f_path.includes("nopic.png")) {
+          fileName = Util.guid() + '-' + 'device' + this.device.n + '-' + this.idx + '-' + 'f_items' + prop + '.jpg'
+        } else {
+          fileName = Util.getFileName(this.f_items[prop].f_path)
+        }
+      } else {
+        if (!this.f_items[prop][pathname] || this.f_items[prop][pathname].includes("nopic.png")) {
+          fileName = Util.guid() + '-' + 'device' + this.device.n + '-' + this.idx + '-' + 'f_items' + prop + '.jpg'
+        } else {
+          fileName = Util.getFileName(this.f_items[prop][pathname])
+        }
+      }
+      let jingweidu = ''
+      if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
+        jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
+        this.f_items[prop].f_longitude = obj.longitude
+        this.f_items[prop].f_latitude = obj.latitude
+      }
+      //tag
+      //tag
+      HostApp._open_a_page({type: 'boomerang',
+        page: 'com.aofeng.hybrid.android.peripheral.ActionPickActivity',
+        param: {file: fileName, requestCode: 111, callback:'javascript:HostApp.__callback__("'+ prop +'","'+ title +'", "%s","'+pathname+'");', watermark: title + '\t时间：'+ Util.toStandardTimeString() + '\t' + Vue.user.name + jingweidu}
+      })
+    },
     cameraCallBack(prop,title, fileName,pathname) {
       //tag
       if (pathname == 'null') {
@@ -625,7 +668,9 @@ export default {
                       if(shImage){
                         this.f_items[n].f_is_defect =true
                         this.f_items[n].f_defect_level = options[i].level
-                        this.f_items[n].f_path = Vue.nopic
+                        if (!multiple){
+                          this.f_items[n].f_path = Vue.nopic
+                        }
                         this.f_items[n].f_live_dispose = '否'
                         this.f_items[n].f_deal_dispose = '未处理'
                         //tag

package/src/components/android/SafecheckOrderV.vue

@@ -1433,7 +1433,7 @@
           if(this.item.f_user_type == '非民用'){
             // 非民用
             if (Vue.config.safecheck.DevicesSetConfig != undefined){
-              if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
+              if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined || !Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type]]) {
                 this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
               }else{
                 this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]])
@@ -1443,7 +1443,7 @@
           }else{
             // 民用户
             if (Vue.config.safecheck.DevicesConfig != undefined){
-              if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
+              if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined || !Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type]]) {
                 this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
               }else{
                 this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type?this.item.f_user_type:'民用']])