safecheck-client 3.0.33-7 → 3.0.33-9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "3.0.33-7",
+  "version": "3.0.33-9",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

package/src/components/planmanage/checkUserList.vue

@@ -111,6 +111,20 @@
                     >
                     </v-select>
                   </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">街&emsp;&emsp;道:</label>
+                    <v-select
+                      class="select select_list"
+                      :value.sync="model.f_street"
+                      v-model="model.f_street"
+                      :options='$parent.$parent.streets'
+                      placeholder='请选择'
+                      condition="ua.f_street_id='{}'"
+                      close-on-select
+                      value-single
+                    >
+                    </v-select>
+                  </div>
                   <!--<div class="form-group col-sm-4" >
                     <label class="font_normal_body">小区名称:</label>
                     <input type="text" class="input_search" v-model="model.f_userinfo_code"
@@ -416,7 +430,8 @@
         checkAll:false,
         checkes:[],
         excelUserCondtion:false,
-        uploadCodeCondition:''
+        uploadCodeCondition:'',
+        streets:[]
       }
     },
     props:["selectplan","userlogin"],
@@ -452,6 +467,7 @@
       },
       loadpage(){
         this.select_search()
+        this.select_street()
         this.Mreadibook()
         this.getSliceArea()
       },
@@ -523,7 +539,10 @@
           value: ''
         }, ...this.$appdata.getParam('用户类型')] : [{label: '全部', value: ''}]
 
-        this.userStates=this.$appdata.getParam('安检用户状态') ? [...this.$appdata.getParam('安检用户状态')] : []
+        this.userStates=this.$appdata.getParam('安检用户状态') ? [{
+          label: '全部',
+          value: ''
+        },...this.$appdata.getParam('安检用户状态')] : [{label: '全部', value: ''}]
         this.gasproperties=this.$appdata.getParam('用气性质') ? [{
           label: '全部',
           value: ''
@@ -548,6 +567,19 @@
           //tag)
         })
       },
+      select_street(){
+        //tag
+        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"id,f_street",tablename:"t_street",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}'`}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+          //tag)
+          if(res.data.length>0){
+            this.streets=[]
+            this.streets.push({label:"全部",value:""})
+            res.data.forEach((result)=>{
+              this.streets.push({label:result.f_street,value:result.id})
+            })
+          }
+        })
+      },
       //获取抄表册
       async Mreadibook(){
         this.cbc=[]

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

@@ -154,7 +154,8 @@
                 </div>
                 <div class="row">
                   <p class="panel-title col-xs-4 text-left font">用户电话</p>
-                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_user_phone2 ? row.f_user_phone2 : row.f_user_phone }}</p>
+                  <p class="panel-title col-xs-8 text-left input-font" style="width: 77%">{{ row.f_user_phone2 ? row.f_user_phone2 : row.f_user_phone }}
+                    <img src="../../../assets/phone.png" style="width: 6%" v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_user_phone2 ? row.f_user_phone2 : row.f_user_phone)'></img></p>
                 </div>
 
                 <div class="row">
@@ -253,6 +254,9 @@
       }
     },
     methods:{
+      makeAPhoneCall(phoneNumber) {
+        this.$androidUtil.makeAPhoneCall(phoneNumber)
+      },
       scan(){
         HostApp.__this__=this,
           HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode();"})

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

@@ -751,6 +751,9 @@
                       if (this.data[device][item].f_items[i].f_is_defect == true && this.data[device][item].f_items[i].f_path == Vue.nopic) {
                         return dev + (this.data[device].indexOf(this.data[device][item]) + 1) + this.data[device][item].f_items[i].f_item_name + this.data[device][item].f_items[i].f_item_value + "选中必须拍照"
                       }
+                      if (this.data[device][item].f_items[i].f_is_defect == true && !this.data[device][item].f_items[i].f_deal_dispose) {
+                        return dev + (this.data[device].indexOf(this.data[device][item]) + 1) + this.data[device][item].f_items[i].f_item_name + this.data[device][item].f_items[i].f_item_value + "选中必须选择处理方式"
+                      }
                     }
                   }
                 }