safecheck-client 3.0.35-4 → 3.0.35-41

package/src/components/rongcheng/SafecheckUserInfo.vue

@@ -55,10 +55,10 @@
                      :options="f_usetypes"
                      clear-button></v-select>
         </div>
-        <div class="col-xs-12" style="margin-left: 20px">
-          <!-- <p class="panel-title col-xs-7 text-left input-font"><a @click="searchDevices(userinfo.f_userinfoid)"></a></p>-->
-          <a class="panel-title col-xs-8 text-left input-font" style="width: 79%;color: blue;text-decoration:underline" v-if="userinfo.f_safecheck_type=='送气类型'" @click="searchDevices(userinfo.f_userinfoid)">设备信息维护</a>
-        </div>
+<!--        <div class="col-xs-12" style="margin-left: 20px">-->
+<!--          &lt;!&ndash; <p class="panel-title col-xs-7 text-left input-font"><a @click="searchDevices(userinfo.f_userinfoid)"></a></p>&ndash;&gt;-->
+<!--          <a class="panel-title col-xs-8 text-left input-font" style="width: 79%;color: blue;text-decoration:underline" v-if="userinfo.f_safecheck_type=='送气类型'" @click="searchDevices(userinfo.f_userinfoid)">设备信息维护</a>-->
+<!--        </div>-->
       </div>
       <div class="panel-body">
         <div v-show="false" class="row repair-info-content auto">
@@ -753,14 +753,14 @@
         })
         this.$parent.$parent.$goto('phone-sell-info', {f_userinfo_id: f_userinfo_id})
       },
-      searchDevices(f_userinfo_id) {
-        this.$dispatch('gotoson', {
-          _this: this.$parent.$parent,
-          title: '设备查看',
-          safe: false
-        })
-        this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id})
-      },
+      // searchDevices(f_userinfo_id) {
+      //   this.$dispatch('gotoson', {
+      //     _this: this.$parent.$parent,
+      //     title: '设备查看',
+      //     safe: false
+      //   })
+      //   this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id})
+      // },
       cameraCallBack(prop, fileName) {
         HostApp.__this__.$set(prop, fileName + '?' + Math.random())
         //tag

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

@@ -81,6 +81,15 @@
                 <input style="width: 100%" class="search_input input-font" v-model="model.f_address" placeholder="请输入用户地址（可模糊查询）">
               </div>
             </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">区/期：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input style="width: 100%" class="search_input input-font" v-model="model.f_area_period" placeholder="请输入" condition="ua.f_area_period like '%{}%'">
+              </div>
+            </div>
             <div class="row app-row">
               <div class="col-xs-4">
                 <img src="../../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -154,10 +163,21 @@
                 </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" style="width: 77%">{{ row.f_user_phone2 ? row.f_user_phone2 : row.f_user_phone }}
+                  <p class="panel-title col-xs-8 text-left input-font">{{ 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">
+                  <p class="panel-title col-xs-4 text-left font">租户电话</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_zuhu_phone }}
+                    <img src="../../../assets/phone.png" style="width: 6%" v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_zuhu_phone)'></img></p>
+
+                </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_rent_phone }}
+                    <img src="../../../assets/phone.png" style="width: 6%" v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_rent_phone)'></img></p>
 
+                </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_residential_area }}</p>
@@ -180,7 +200,7 @@
                 </div>
                 <div class="row" v-if="row.f_table_state = '停用'">
                   <p class="panel-title col-xs-4 text-left font">原因</p>
-                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_table_state }}</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_black_comments }}</p>
                 </div>
               </div>
             </div>

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

@@ -111,7 +111,7 @@ export default {
       })
       let classes_str = classes_arr.data.map(item => { return `'${item.name}'` }).join()
       if (classes_arr.data && classes_arr.data.length >0){
-        this.condition += ` and ( f_class in (${classes_str})  or f_class  is null)`
+        this.condition += ` and ( f_class in (${classes_str})  or f_class =  '')`
       }
       let outlets_arr = await new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
         data: {
@@ -119,7 +119,7 @@ export default {
         }
       })
       if (outlets_arr.data && outlets_arr.data.length >0){
-        this.condition += ` and ( f_outlets in (${outlets_arr.data.map(outlets => { return `'${outlets.name.substring(3)}'` }).join()}) or f_outlets is null )`
+        this.condition += ` and ( f_outlets in (${outlets_arr.data.map(outlets => { return `'${outlets.name.substring(3)}'` }).join()}) or f_outlets = '' )`
       }
     },
     reload() {

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

@@ -104,6 +104,16 @@
                         close-on-select clear-button>
               </v-select>
             </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_area_period" class="font text-left">区/期：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input id="f_area_period" class="search_input input-font"
+                       v-model=model.f_area_period condition="f_area_period like '%{}%'" />
+              </div>
+            </div>
             <div class="row app-row">
               <div class="col-xs-4">
                 <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">